home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1995-08-29 | 28.6 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 1%
| dexvert
| Emacs Compiled Lisp (other/emacsCompiledLisp)
| magic
| Unsupported |
| 1%
| dexvert
| Combustion 2 Particle Library (other/combustion2ParticleLibrary)
| ext
| Unsupported |
| 100%
| file
| Emacs/XEmacs v19 byte-compiled Lisp data
| default
| |
| 99%
| file
| data
| default
| |
| 55%
| TrID
| Emacs/XEmacs byte-compiled Lisp (generic)
| default
| |
| 44%
| TrID
| Summation Document Image Information Load File
| default (weak)
| |
| 100%
| xdgMime
| text/x-emacs-lisp
| default (weak)
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 63 74 68 6f 6d 70 40 |piled by| cthomp@|
|00000020| 77 69 6c 6c 6f 77 2e 63 | 73 2e 75 69 75 63 2e 65 |willow.c|s.uiuc.e|
|00000030| 64 75 20 6f 6e 20 54 75 | 65 20 41 75 67 20 32 39 |du on Tu|e Aug 29|
|00000040| 20 31 34 3a 33 37 3a 30 | 36 20 31 39 39 35 0a 3b | 14:37:0|6 1995.;|
|00000050| 3b 3b 20 66 72 6f 6d 20 | 66 69 6c 65 20 2f 65 78 |;; from |file /ex|
|00000060| 70 6f 72 74 2f 77 69 6c | 6c 6f 77 33 2f 78 65 6d |port/wil|low3/xem|
|00000070| 61 63 73 2d 31 39 2e 31 | 33 2d 72 65 6c 65 61 73 |acs-19.1|3-releas|
|00000080| 65 2f 65 64 69 74 6f 72 | 2f 6c 69 73 70 2f 65 64 |e/editor|/lisp/ed|
|00000090| 69 66 66 2f 65 64 69 66 | 66 2d 6d 65 74 61 2e 65 |iff/edif|f-meta.e|
|000000a0| 6c 0a 3b 3b 3b 20 65 6d | 61 63 73 20 76 65 72 73 |l.;;; em|acs vers|
|000000b0| 69 6f 6e 20 31 39 2e 31 | 33 20 58 45 6d 61 63 73 |ion 19.1|3 XEmacs|
|000000c0| 20 4c 75 63 69 64 2e 0a | 3b 3b 3b 20 62 79 74 65 | Lucid..|;;; byte|
|000000d0| 63 6f 6d 70 20 76 65 72 | 73 69 6f 6e 20 32 2e 32 |comp ver|sion 2.2|
|000000e0| 35 3b 20 31 2d 53 65 70 | 2d 39 34 2e 0a 3b 3b 3b |5; 1-Sep|-94..;;;|
|000000f0| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000100| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000110| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000120| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000130| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 38 2e 0a |st in Em|acs 18..|
|00000140| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000150| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000160| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000170| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|00000180| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|00000190| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. | (str|
|000001a0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001b0| 76 65 72 73 69 6f 6e 20 | 22 31 39 22 29 29 29 0a |version |"19"))).|
|000001c0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 54 68 69 73 | (err|or "This|
|000001d0| 20 66 69 6c 65 20 77 61 | 73 20 63 6f 6d 70 69 6c | file wa|s compil|
|000001e0| 65 64 20 66 6f 72 20 45 | 6d 61 63 73 20 31 39 2e |ed for E|macs 19.|
|000001f0| 22 29 29 0a 0a 28 72 65 | 71 75 69 72 65 20 27 65 |"))..(re|quire 'e|
|00000200| 64 69 66 66 2d 69 6e 69 | 74 29 0a 28 64 65 66 76 |diff-ini|t).(defv|
|00000210| 61 72 20 65 64 69 66 66 | 2d 6d 65 74 61 2d 62 75 |ar ediff|-meta-bu|
|00000220| 66 66 65 72 20 6e 69 6c | 20 22 5c 0a 22 29 0a 28 |ffer nil| "\.").(|
|00000230| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00000240| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00000250| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00000260| 61 6c 20 65 64 69 66 66 | 2d 6d 65 74 61 2d 62 75 |al ediff|-meta-bu|
|00000270| 66 66 65 72 20 70 75 74 | 20 70 65 72 6d 61 6e 65 |ffer put| permane|
|00000280| 6e 74 2d 6c 6f 63 61 6c | 20 74 5d 20 34 29 0a 28 |nt-local| t] 4).(|
|00000290| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 70 61 72 |defvar e|diff-par|
|000002a0| 65 6e 74 2d 6d 65 74 61 | 2d 62 75 66 66 65 72 20 |ent-meta|-buffer |
|000002b0| 6e 69 6c 20 22 5c 0a 22 | 29 0a 28 62 79 74 65 2d |nil "\."|).(byte-|
|000002c0| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 88 |code "..|!.....#.|
|000002d0| c5 c6 21 ac 83 c7 16 06 | c8 16 09 c7 87 22 20 5b |..!.....|....." [|
|000002e0| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|000002f0| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00000300| 2d 70 61 72 65 6e 74 2d | 6d 65 74 61 2d 62 75 66 |-parent-|meta-buf|
|00000310| 66 65 72 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |fer put |permanen|
|00000320| 74 2d 6c 6f 63 61 6c 20 | 74 20 62 6f 75 6e 64 70 |t-local |t boundp|
|00000330| 20 65 64 69 66 66 2d 72 | 65 67 69 73 74 72 79 2d | ediff-r|egistry-|
|00000340| 62 75 66 66 65 72 20 6e | 69 6c 20 22 54 68 69 73 |buffer n|il "This|
|00000350| 20 69 73 20 61 6e 20 45 | 64 69 66 66 20 53 65 73 | is an E|diff Ses|
|00000360| 73 69 6f 6e 20 47 72 6f | 75 70 20 50 61 6e 65 6c |sion Gro|up Panel|
|00000370| 3a 20 25 73 5c 6e 5c 6e | 55 73 65 66 75 6c 20 63 |: %s\n\n|Useful c|
|00000380| 6f 6d 6d 61 6e 64 73 3a | 5c 6e 20 20 20 20 20 62 |ommands:|\n b|
|00000390| 75 74 74 6f 6e 32 2c 20 | 60 76 27 2c 20 52 45 54 |utton2, |`v', RET|
|000003a0| 20 6f 76 65 72 20 61 20 | 73 65 73 73 69 6f 6e 20 | over a |session |
|000003b0| 6c 69 6e 65 3a 20 20 20 | 73 74 61 72 74 20 74 68 |line: |start th|
|000003c0| 61 74 20 45 64 69 66 66 | 20 73 65 73 73 69 6f 6e |at Ediff| session|
|000003d0| 5c 6e 20 20 20 20 20 60 | 4d 27 20 69 6e 20 61 6e |\n `|M' in an|
|000003e0| 79 20 73 65 73 73 69 6f | 6e 20 69 6e 76 6f 6b 65 |y sessio|n invoke|
|000003f0| 64 20 66 72 6f 6d 20 68 | 65 72 65 3a 20 20 20 20 |d from h|ere: |
|00000400| 62 72 69 6e 67 20 62 61 | 63 6b 20 74 68 69 73 20 |bring ba|ck this |
|00000410| 62 75 66 66 65 72 5c 6e | 20 20 20 20 20 60 52 27 |buffer\n| `R'|
|00000420| 3a 09 64 69 73 70 6c 61 | 79 20 74 68 65 20 72 65 |:.displa|y the re|
|00000430| 67 69 73 74 72 79 20 6f | 66 20 61 63 74 69 76 65 |gistry o|f active|
|00000440| 20 45 64 69 66 66 20 73 | 65 73 73 69 6f 6e 73 5c | Ediff s|essions\|
|00000450| 6e 20 20 20 20 20 60 68 | 27 3a 09 6d 61 72 6b 20 |n `h|':.mark |
|00000460| 73 65 73 73 69 6f 6e 20 | 66 6f 72 20 68 69 64 69 |session |for hidi|
|00000470| 6e 67 3b 20 77 69 74 68 | 20 70 72 65 66 69 78 20 |ng; with| prefix |
|00000480| 61 72 67 2d 2d 75 6e 6d | 61 72 6b 5c 6e 20 20 20 |arg--unm|ark\n |
|00000490| 20 20 60 78 27 3a 09 68 | 69 64 65 20 6d 61 72 6b | `x':.h|ide mark|
|000004a0| 65 64 20 73 65 73 73 69 | 6f 6e 73 3b 20 77 69 74 |ed sessi|ons; wit|
|000004b0| 68 20 70 72 65 66 69 78 | 20 61 72 67 2d 2d 75 6e |h prefix| arg--un|
|000004c0| 68 69 64 65 20 68 69 64 | 64 65 6e 20 73 65 73 73 |hide hid|den sess|
|000004d0| 69 6f 6e 73 5c 6e 20 20 | 20 20 20 60 6d 27 3a 09 |ions\n | `m':.|
|000004e0| 6d 61 72 6b 20 73 65 73 | 73 69 6f 6e 20 66 6f 72 |mark ses|sion for|
|000004f0| 20 6e 6f 6e 2d 68 69 64 | 69 6e 67 20 6f 70 65 72 | non-hid|ing oper|
|00000500| 61 74 69 6f 6e 3b 20 77 | 69 74 68 20 70 72 65 66 |ation; w|ith pref|
|00000510| 69 78 20 61 72 67 2d 2d | 75 6e 6d 61 72 6b 5c 6e |ix arg--|unmark\n|
|00000520| 20 20 20 20 20 53 50 43 | 3a 09 6e 65 78 74 20 73 | SPC|:.next s|
|00000530| 65 73 73 69 6f 6e 5c 6e | 20 20 20 20 20 44 45 4c |ession\n| DEL|
|00000540| 3a 09 70 72 65 76 69 6f | 75 73 20 73 65 73 73 69 |:.previo|us sessi|
|00000550| 6f 6e 5c 6e 20 20 20 20 | 20 60 45 27 3a 09 62 72 |on\n | `E':.br|
|00000560| 6f 77 73 65 20 45 64 69 | 66 66 20 6f 6e 2d 6c 69 |owse Edi|ff on-li|
|00000570| 6e 65 20 6d 61 6e 75 61 | 6c 5c 6e 20 20 20 20 20 |ne manua|l\n |
|00000580| 60 71 27 3a 09 71 75 69 | 74 20 74 68 69 73 20 73 |`q':.qui|t this s|
|00000590| 65 73 73 69 6f 6e 20 67 | 72 6f 75 70 5c 6e 22 20 |ession g|roup\n" |
|000005a0| 65 64 69 66 66 2d 6d 65 | 74 61 2d 62 75 66 66 65 |ediff-me|ta-buffe|
|000005b0| 72 2d 6d 65 73 73 61 67 | 65 5d 20 34 29 0a 28 64 |r-messag|e] 4).(d|
|000005c0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 6d 65 74 61 |efvar ed|iff-meta|
|000005d0| 2d 62 75 66 66 65 72 2d | 6d 61 70 20 6e 69 6c 20 |-buffer-|map nil |
|000005e0| 22 5c 0a 54 68 65 20 6b | 65 79 6d 61 70 20 66 6f |"\.The k|eymap fo|
|000005f0| 72 20 74 68 65 20 6d 65 | 74 61 20 62 75 66 66 65 |r the me|ta buffe|
|00000600| 72 2e 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |r.").(by|te-code |
|00000610| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00000620| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00000630| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 6d |er-local| ediff-m|
|00000640| 65 74 61 2d 62 75 66 66 | 65 72 2d 6d 61 70 20 70 |eta-buff|er-map p|
|00000650| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|00000660| 61 6c 20 74 5d 20 34 29 | 0a 28 64 65 66 76 61 72 |al t] 4)|.(defvar|
|00000670| 20 65 64 69 66 66 2d 64 | 69 72 2d 64 69 66 66 73 | ediff-d|ir-diffs|
|00000680| 2d 62 75 66 66 65 72 2d | 6d 61 70 20 28 6d 61 6b |-buffer-|map (mak|
|00000690| 65 2d 73 70 61 72 73 65 | 2d 6b 65 79 6d 61 70 29 |e-sparse|-keymap)|
|000006a0| 20 22 5c 0a 54 68 65 20 | 6b 65 79 6d 61 70 20 74 | "\.The |keymap t|
|000006b0| 6f 20 62 65 20 69 6e 73 | 74 61 6c 6c 65 64 20 69 |o be ins|talled i|
|000006c0| 6e 20 74 68 65 20 62 75 | 66 66 65 72 20 73 68 6f |n the bu|ffer sho|
|000006d0| 77 69 6e 67 20 64 69 66 | 66 65 72 65 6e 63 65 73 |wing dif|ferences|
|000006e0| 20 62 65 74 77 65 65 6e | 0a 64 69 72 65 63 74 6f | between|.directo|
|000006f0| 72 69 65 73 2e 22 29 0a | 28 64 65 66 76 61 72 20 |ries.").|(defvar |
|00000700| 65 64 69 66 66 2d 6d 65 | 74 61 2d 61 63 74 69 6f |ediff-me|ta-actio|
|00000710| 6e 2d 66 75 6e 63 74 69 | 6f 6e 20 6e 69 6c 20 22 |n-functi|on nil "|
|00000720| 5c 0a 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |\.").(by|te-code |
|00000730| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00000740| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00000750| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 6d |er-local| ediff-m|
|00000760| 65 74 61 2d 61 63 74 69 | 6f 6e 2d 66 75 6e 63 74 |eta-acti|on-funct|
|00000770| 69 6f 6e 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |ion put |permanen|
|00000780| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 28 64 |t-local |t] 4).(d|
|00000790| 65 66 76 61 72 20 65 64 | 69 66 66 2d 6d 65 74 61 |efvar ed|iff-meta|
|000007a0| 2d 72 65 64 72 61 77 2d | 66 75 6e 63 74 69 6f 6e |-redraw-|function|
|000007b0| 20 6e 69 6c 20 22 5c 0a | 22 29 0a 28 62 79 74 65 | nil "\.|").(byte|
|000007c0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|000007d0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|000007e0| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|000007f0| 64 69 66 66 2d 6d 65 74 | 61 2d 72 65 64 72 61 77 |diff-met|a-redraw|
|00000800| 2d 66 75 6e 63 74 69 6f | 6e 20 70 75 74 20 70 65 |-functio|n put pe|
|00000810| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00000820| 20 34 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 4).(def|var edif|
|00000830| 66 2d 73 65 73 73 69 6f | 6e 2d 61 63 74 69 6f 6e |f-sessio|n-action|
|00000840| 2d 66 75 6e 63 74 69 6f | 6e 20 6e 69 6c 20 22 5c |-functio|n nil "\|
|00000850| 0a 22 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |.").(byt|e-code "|
|00000860| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00000870| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00000880| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 73 65 |r-local |ediff-se|
|00000890| 73 73 69 6f 6e 2d 61 63 | 74 69 6f 6e 2d 66 75 6e |ssion-ac|tion-fun|
|000008a0| 63 74 69 6f 6e 20 70 75 | 74 20 70 65 72 6d 61 6e |ction pu|t perman|
|000008b0| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|000008c0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 6d 65 |(defvar |ediff-me|
|000008d0| 74 61 6a 6f 62 2d 6e 61 | 6d 65 20 6e 69 6c 20 22 |tajob-na|me nil "|
|000008e0| 5c 0a 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |\.").(by|te-code |
|000008f0| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00000900| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00000910| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 6d |er-local| ediff-m|
|00000920| 65 74 61 6a 6f 62 2d 6e | 61 6d 65 20 70 75 74 20 |etajob-n|ame put |
|00000930| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00000940| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 64 |t] 4).(d|efvar ed|
|00000950| 69 66 66 2d 6d 65 74 61 | 2d 64 69 66 66 2d 62 75 |iff-meta|-diff-bu|
|00000960| 66 66 65 72 20 6e 69 6c | 20 22 5c 0a 22 29 0a 28 |ffer nil| "\.").(|
|00000970| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00000980| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00000990| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|000009a0| 61 6c 20 65 64 69 66 66 | 2d 6d 65 74 61 2d 64 69 |al ediff|-meta-di|
|000009b0| 66 66 2d 62 75 66 66 65 | 72 20 70 75 74 20 70 65 |ff-buffe|r put pe|
|000009c0| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|000009d0| 20 34 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 4).(def|var edif|
|000009e0| 66 2d 66 69 6c 74 65 72 | 69 6e 67 2d 72 65 67 65 |f-filter|ing-rege|
|000009f0| 78 70 2d 68 69 73 74 6f | 72 79 20 6e 69 6c 20 22 |xp-histo|ry nil "|
|00000a00| 5c 0a 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |\.").(de|fvar edi|
|00000a10| 66 66 2d 6d 65 74 61 2d | 6c 69 73 74 20 6e 69 6c |ff-meta-|list nil|
|00000a20| 20 22 5c 0a 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 | "\.").(|byte-cod|
|00000a30| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|00000a40| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00000a50| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00000a60| 2d 6d 65 74 61 2d 6c 69 | 73 74 20 70 75 74 20 70 |-meta-li|st put p|
|00000a70| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|00000a80| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |] 4).(de|fvar edi|
|00000a90| 66 66 2d 64 69 72 2d 64 | 69 66 66 65 72 65 6e 63 |ff-dir-d|ifferenc|
|00000aa0| 65 2d 6c 69 73 74 20 6e | 69 6c 20 22 5c 0a 22 29 |e-list n|il "\.")|
|00000ab0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00000ac0| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00000ad0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00000ae0| 6f 63 61 6c 20 65 64 69 | 66 66 2d 64 69 72 2d 64 |ocal edi|ff-dir-d|
|00000af0| 69 66 66 65 72 65 6e 63 | 65 2d 6c 69 73 74 20 70 |ifferenc|e-list p|
|00000b00| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|00000b10| 61 6c 20 74 5d 20 34 29 | 0a 28 64 65 66 76 61 72 |al t] 4)|.(defvar|
|00000b20| 20 65 64 69 66 66 2d 64 | 69 72 2d 64 69 66 66 73 | ediff-d|ir-diffs|
|00000b30| 2d 62 75 66 66 65 72 20 | 6e 69 6c 20 22 5c 0a 22 |-buffer |nil "\."|
|00000b40| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00000b50| 21 88 c2 c1 c3 c4 23 88 | c5 c6 21 ac 83 c7 16 06 |!.....#.|..!.....|
|00000b60| c7 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |.." [mak|e-variab|
|00000b70| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00000b80| 65 64 69 66 66 2d 64 69 | 72 2d 64 69 66 66 73 2d |ediff-di|r-diffs-|
|00000b90| 62 75 66 66 65 72 20 70 | 75 74 20 70 65 72 6d 61 |buffer p|ut perma|
|00000ba0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 20 62 6f 75 |nent-loc|al t bou|
|00000bb0| 6e 64 70 20 65 64 69 66 | 66 2d 73 65 73 73 69 6f |ndp edif|f-sessio|
|00000bc0| 6e 2d 72 65 67 69 73 74 | 72 79 20 6e 69 6c 5d 20 |n-regist|ry nil] |
|00000bd0| 34 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |4).(defv|ar ediff|
|00000be0| 2d 72 65 67 69 73 74 72 | 79 2d 73 65 74 75 70 2d |-registr|y-setup-|
|00000bf0| 68 6f 6f 6b 73 20 6e 69 | 6c 20 22 5c 0a 2a 48 6f |hooks ni|l "\.*Ho|
|00000c00| 6f 6b 73 20 72 75 6e 20 | 6a 75 73 74 20 61 66 74 |oks run |just aft|
|00000c10| 65 72 20 74 68 65 20 72 | 65 67 69 73 74 72 79 20 |er the r|egistry |
|00000c20| 63 6f 6e 74 72 6f 6c 20 | 70 61 6e 65 6c 20 69 73 |control |panel is|
|00000c30| 20 73 65 74 20 75 70 2e | 22 29 0a 28 64 65 66 76 | set up.|").(defv|
|00000c40| 61 72 20 65 64 69 66 66 | 2d 73 65 73 73 69 6f 6e |ar ediff|-session|
|00000c50| 2d 67 72 6f 75 70 2d 73 | 65 74 75 70 2d 68 6f 6f |-group-s|etup-hoo|
|00000c60| 6b 73 20 6e 69 6c 20 22 | 5c 0a 2a 48 6f 6f 6b 73 |ks nil "|\.*Hooks|
|00000c70| 20 72 75 6e 20 6a 75 73 | 74 20 61 66 74 65 72 20 | run jus|t after |
|00000c80| 61 20 6d 65 74 61 2d 62 | 75 66 66 65 72 20 63 6f |a meta-b|uffer co|
|00000c90| 6e 74 72 6f 6c 6c 69 6e | 67 20 61 20 73 65 73 73 |ntrollin|g a sess|
|00000ca0| 69 6f 6e 20 67 72 6f 75 | 70 2c 20 73 75 63 68 20 |ion grou|p, such |
|00000cb0| 61 73 0a 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |as.ediff|-directo|
|00000cc0| 72 69 65 73 2c 20 69 73 | 20 72 75 6e 2e 22 29 0a |ries, is| run.").|
|00000cd0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 73 68 |(defvar |ediff-sh|
|00000ce0| 6f 77 2d 72 65 67 69 73 | 74 72 79 2d 68 6f 6f 6b |ow-regis|try-hook|
|00000cf0| 73 20 6e 69 6c 20 22 5c | 0a 2a 48 6f 6f 6b 73 20 |s nil "\|.*Hooks |
|00000d00| 72 75 6e 20 6a 75 73 74 | 20 61 66 74 65 72 20 74 |run just| after t|
|00000d10| 68 65 20 72 65 67 69 73 | 74 72 79 20 62 75 66 66 |he regis|try buff|
|00000d20| 65 72 20 69 73 20 73 68 | 6f 77 6e 2e 22 29 0a 28 |er is sh|own.").(|
|00000d30| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 73 68 6f |defvar e|diff-sho|
|00000d40| 77 2d 73 65 73 73 69 6f | 6e 2d 67 72 6f 75 70 2d |w-sessio|n-group-|
|00000d50| 68 6f 6f 6b 73 20 6e 69 | 6c 20 22 5c 0a 2a 48 6f |hooks ni|l "\.*Ho|
|00000d60| 6f 6b 73 20 72 75 6e 20 | 6a 75 73 74 20 61 66 74 |oks run |just aft|
|00000d70| 65 72 20 61 20 73 65 73 | 73 69 6f 6e 20 67 72 6f |er a ses|sion gro|
|00000d80| 75 70 20 62 75 66 66 65 | 72 20 69 73 20 73 68 6f |up buffe|r is sho|
|00000d90| 77 6e 2e 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |wn.").(b|yte-code|
|00000da0| 20 22 c0 c1 4d 88 c2 c3 | 4d 88 c4 c5 4d 88 c6 c7 | "..M...|M...M...|
|00000db0| 4d 88 c8 c9 4d 88 ca cb | 4d 88 cc cd 4d 88 ce cf |M...M...|M...M...|
|00000dc0| 4d 88 d0 d1 4d 88 d2 d3 | 4d 88 d4 d5 4d 88 d6 d7 |M...M...|M...M...|
|00000dd0| 4d 87 22 20 5b 65 64 69 | 66 66 2d 67 65 74 2d 67 |M." [edi|ff-get-g|
|00000de0| 72 6f 75 70 2d 62 75 66 | 66 65 72 20 23 5b 28 6d |roup-buf|fer #[(m|
|00000df0| 65 74 61 2d 6c 69 73 74 | 29 20 22 08 40 40 87 22 |eta-list|) ".@@."|
|00000e00| 20 5b 6d 65 74 61 2d 6c | 69 73 74 5d 20 31 5d 20 | [meta-l|ist] 1] |
|00000e10| 65 64 69 66 66 2d 67 65 | 74 2d 67 72 6f 75 70 2d |ediff-ge|t-group-|
|00000e20| 72 65 67 65 78 70 20 23 | 5b 28 6d 65 74 61 2d 6c |regexp #|[(meta-l|
|00000e30| 69 73 74 29 20 22 08 40 | 41 40 87 22 20 5b 6d 65 |ist) ".@|A@." [me|
|00000e40| 74 61 2d 6c 69 73 74 5d | 20 31 5d 20 65 64 69 66 |ta-list]| 1] edif|
|00000e50| 66 2d 67 65 74 2d 67 72 | 6f 75 70 2d 6f 62 6a 41 |f-get-gr|oup-objA|
|00000e60| 20 23 5b 28 6d 65 74 61 | 2d 6c 69 73 74 29 20 22 | #[(meta|-list) "|
|00000e70| c0 09 40 38 87 22 20 5b | 32 20 6d 65 74 61 2d 6c |..@8." [|2 meta-l|
|00000e80| 69 73 74 5d 20 32 5d 20 | 65 64 69 66 66 2d 67 65 |ist] 2] |ediff-ge|
|00000e90| 74 2d 67 72 6f 75 70 2d | 6f 62 6a 42 20 23 5b 28 |t-group-|objB #[(|
|00000ea0| 6d 65 74 61 2d 6c 69 73 | 74 29 20 22 c0 09 40 38 |meta-lis|t) "..@8|
|00000eb0| 87 22 20 5b 33 20 6d 65 | 74 61 2d 6c 69 73 74 5d |." [3 me|ta-list]|
|00000ec0| 20 32 5d 20 65 64 69 66 | 66 2d 67 65 74 2d 67 72 | 2] edif|f-get-gr|
|00000ed0| 6f 75 70 2d 6f 62 6a 43 | 20 23 5b 28 6d 65 74 61 |oup-objC| #[(meta|
|00000ee0| 2d 6c 69 73 74 29 20 22 | c0 09 40 38 87 22 20 5b |-list) "|..@8." [|
|00000ef0| 34 20 6d 65 74 61 2d 6c | 69 73 74 5d 20 32 5d 20 |4 meta-l|ist] 2] |
|00000f00| 65 64 69 66 66 2d 67 65 | 74 2d 73 65 73 73 69 6f |ediff-ge|t-sessio|
|00000f10| 6e 2d 62 75 66 66 65 72 | 20 23 5b 28 65 6c 74 29 |n-buffer| #[(elt)|
|00000f20| 20 22 08 40 87 22 20 5b | 65 6c 74 5d 20 31 5d 20 | ".@." [|elt] 1] |
|00000f30| 65 64 69 66 66 2d 67 65 | 74 2d 73 65 73 73 69 6f |ediff-ge|t-sessio|
|00000f40| 6e 2d 73 74 61 74 75 73 | 20 23 5b 28 65 6c 74 29 |n-status| #[(elt)|
|00000f50| 20 22 08 41 40 87 22 20 | 5b 65 6c 74 5d 20 31 5d | ".A@." |[elt] 1]|
|00000f60| 20 65 64 69 66 66 2d 67 | 65 74 2d 73 65 73 73 69 | ediff-g|et-sessi|
|00000f70| 6f 6e 2d 6f 62 6a 41 20 | 23 5b 28 65 6c 74 29 20 |on-objA |#[(elt) |
|00000f80| 22 c0 09 38 87 22 20 5b | 32 20 65 6c 74 5d 20 32 |"..8." [|2 elt] 2|
|00000f90| 5d 20 65 64 69 66 66 2d | 67 65 74 2d 73 65 73 73 |] ediff-|get-sess|
|00000fa0| 69 6f 6e 2d 6f 62 6a 42 | 20 23 5b 28 65 6c 74 29 |ion-objB| #[(elt)|
|00000fb0| 20 22 c0 09 38 87 22 20 | 5b 33 20 65 6c 74 5d 20 | "..8." |[3 elt] |
|00000fc0| 32 5d 20 65 64 69 66 66 | 2d 67 65 74 2d 73 65 73 |2] ediff|-get-ses|
|00000fd0| 73 69 6f 6e 2d 6f 62 6a | 43 20 23 5b 28 65 6c 74 |sion-obj|C #[(elt|
|00000fe0| 29 20 22 c0 09 38 87 22 | 20 5b 34 20 65 6c 74 5d |) "..8."| [4 elt]|
|00000ff0| 20 32 5d 20 65 64 69 66 | 66 2d 73 65 74 2d 73 65 | 2] edif|f-set-se|
|00001000| 73 73 69 6f 6e 2d 73 74 | 61 74 75 73 20 23 5b 28 |ssion-st|atus #[(|
|00001010| 73 65 73 73 69 6f 6e 2d | 69 6e 66 6f 20 6e 65 77 |session-|info new|
|00001020| 2d 73 74 61 74 75 73 29 | 20 22 08 41 09 a0 87 22 |-status)| ".A..."|
|00001030| 20 5b 73 65 73 73 69 6f | 6e 2d 69 6e 66 6f 20 6e | [sessio|n-info n|
|00001040| 65 77 2d 73 74 61 74 75 | 73 5d 20 32 5d 20 65 64 |ew-statu|s] 2] ed|
|00001050| 69 66 66 2d 73 65 74 75 | 70 2d 6d 65 74 61 2d 6d |iff-setu|p-meta-m|
|00001060| 61 70 20 23 5b 6e 69 6c | 20 22 c0 20 11 c2 09 21 |ap #[nil| ". ...!|
|00001070| 88 c3 09 c4 c5 23 88 c3 | 09 c6 c7 23 88 c3 09 c8 |.....#..|...#....|
|00001080| c9 23 88 c3 09 ca 0e 0b | 23 88 c3 09 cc 0e 0b 23 |.#......|#......#|
|00001090| 88 c3 09 cd ce 23 88 c3 | 09 cf d0 23 88 c3 09 d1 |.....#..|...#....|
|000010a0| d0 23 88 c3 09 d2 d0 23 | 88 0e 13 ab 86 c3 09 d4 |.#.....#|........|
|000010b0| d0 23 88 0e 15 ab 89 c3 | 09 d6 0e 0b 23 88 aa 87 |.#......|....#...|
|000010c0| c3 09 d7 0e 0b 23 88 d8 | 09 21 87 22 20 5b 6d 61 |.....#..|.!." [ma|
|000010d0| 6b 65 2d 73 70 61 72 73 | 65 2d 6b 65 79 6d 61 70 |ke-spars|e-keymap|
|000010e0| 20 65 64 69 66 66 2d 6d | 65 74 61 2d 62 75 66 66 | ediff-m|eta-buff|
|000010f0| 65 72 2d 6d 61 70 20 73 | 75 70 70 72 65 73 73 2d |er-map s|uppress-|
|00001100| 6b 65 79 6d 61 70 20 64 | 65 66 69 6e 65 2d 6b 65 |keymap d|efine-ke|
|00001110| 79 20 22 71 22 20 65 64 | 69 66 66 2d 71 75 69 74 |y "q" ed|iff-quit|
|00001120| 2d 6d 65 74 61 2d 62 75 | 66 66 65 72 20 22 52 22 |-meta-bu|ffer "R"|
|00001130| 20 65 64 69 66 66 2d 73 | 68 6f 77 2d 72 65 67 69 | ediff-s|how-regi|
|00001140| 73 74 72 79 20 22 45 22 | 20 65 64 69 66 66 2d 64 |stry "E"| ediff-d|
|00001150| 6f 63 75 6d 65 6e 74 61 | 74 69 6f 6e 20 22 76 22 |ocumenta|tion "v"|
|00001160| 20 65 64 69 66 66 2d 6d | 65 74 61 2d 61 63 74 69 | ediff-m|eta-acti|
|00001170| 6f 6e 2d 66 75 6e 63 74 | 69 6f 6e 20 22 0d 22 20 |on-funct|ion "." |
|00001180| 22 20 22 20 65 64 69 66 | 66 2d 6e 65 78 74 2d 6d |" " edif|f-next-m|
|00001190| 65 74 61 2d 69 74 65 6d | 20 22 7f 22 20 65 64 69 |eta-item| "." edi|
|000011a0| 66 66 2d 70 72 65 76 69 | 6f 75 73 2d 6d 65 74 61 |ff-previ|ous-meta|
|000011b0| 2d 69 74 65 6d 20 5b 64 | 65 6c 65 74 65 5d 20 5b |-item [d|elete] [|
|000011c0| 62 61 63 6b 73 70 61 63 | 65 5d 20 65 64 69 66 66 |backspac|e] ediff|
|000011d0| 2d 6e 6f 2d 65 6d 61 63 | 73 2d 68 65 6c 70 2d 69 |-no-emac|s-help-i|
|000011e0| 6e 2d 63 6f 6e 74 72 6f | 6c 2d 62 75 66 66 65 72 |n-contro|l-buffer|
|000011f0| 20 22 08 22 20 65 64 69 | 66 66 2d 65 6d 61 63 73 | "." edi|ff-emacs|
|00001200| 2d 70 20 5b 6d 6f 75 73 | 65 2d 32 5d 20 5b 62 75 |-p [mous|e-2] [bu|
|00001210| 74 74 6f 6e 32 5d 20 75 | 73 65 2d 6c 6f 63 61 6c |tton2] u|se-local|
|00001220| 2d 6d 61 70 5d 20 34 5d | 5d 20 32 29 0a 28 66 73 |-map] 4]|] 2).(fs|
|00001230| 65 74 20 27 65 64 69 66 | 66 2d 6d 65 74 61 2d 6d |et 'edif|f-meta-m|
|00001240| 6f 64 65 20 23 5b 6e 69 | 6c 20 22 c0 20 88 c1 12 |ode #[ni|l ". ...|
|00001250| c3 89 14 87 22 20 5b 6b | 69 6c 6c 2d 61 6c 6c 2d |...." [k|ill-all-|
|00001260| 6c 6f 63 61 6c 2d 76 61 | 72 69 61 62 6c 65 73 20 |local-va|riables |
|00001270| 65 64 69 66 66 2d 6d 65 | 74 61 2d 6d 6f 64 65 20 |ediff-me|ta-mode |
|00001280| 6d 61 6a 6f 72 2d 6d 6f | 64 65 20 22 4d 65 74 61 |major-mo|de "Meta|
|00001290| 45 64 69 66 66 22 20 6d | 6f 64 65 2d 6e 61 6d 65 |Ediff" m|ode-name|
|000012a0| 5d 20 32 20 22 5c 0a 54 | 68 69 73 20 6d 6f 64 65 |] 2 "\.T|his mode|
|000012b0| 20 63 6f 6e 74 72 6f 6c | 73 20 61 6c 6c 20 6f 70 | control|s all op|
|000012c0| 65 72 61 74 69 6f 6e 73 | 20 6f 6e 20 45 64 69 66 |erations| on Edif|
|000012d0| 66 20 73 65 73 73 69 6f | 6e 20 67 72 6f 75 70 73 |f sessio|n groups|
|000012e0| 2e 0a 49 74 20 69 73 20 | 65 6e 74 65 72 65 64 20 |..It is |entered |
|000012f0| 74 68 72 6f 75 67 68 20 | 6f 6e 65 20 6f 66 20 74 |through |one of t|
|00001300| 68 65 20 66 6f 6c 6c 6f | 77 69 6e 67 20 63 6f 6d |he follo|wing com|
|00001310| 6d 61 6e 64 73 3a 0a 09 | 60 65 64 69 66 66 2d 64 |mands:..|`ediff-d|
|00001320| 69 72 65 63 74 6f 72 69 | 65 73 27 0a 09 60 65 64 |irectori|es'..`ed|
|00001330| 69 72 73 27 0a 09 60 65 | 64 69 66 66 2d 64 69 72 |irs'..`e|diff-dir|
|00001340| 65 63 74 6f 72 69 65 73 | 33 27 0a 09 60 65 64 69 |ectories|3'..`edi|
|00001350| 72 73 33 27 0a 09 60 65 | 64 69 66 66 2d 6d 65 72 |rs3'..`e|diff-mer|
|00001360| 67 65 2d 64 69 72 65 63 | 74 6f 72 69 65 73 27 0a |ge-direc|tories'.|
|00001370| 09 60 65 64 69 72 73 2d | 6d 65 72 67 65 27 0a 09 |.`edirs-|merge'..|
|00001380| 60 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 |`ediff-m|erge-dir|
|00001390| 65 63 74 6f 72 69 65 73 | 2d 77 69 74 68 2d 61 6e |ectories|-with-an|
|000013a0| 63 65 73 74 6f 72 27 0a | 09 60 65 64 69 72 73 2d |cestor'.|.`edirs-|
|000013b0| 6d 65 72 67 65 2d 77 69 | 74 68 2d 61 6e 63 65 73 |merge-wi|th-ances|
|000013c0| 74 6f 72 27 0a 09 60 65 | 64 69 66 66 2d 64 69 72 |tor'..`e|diff-dir|
|000013d0| 65 63 74 6f 72 79 2d 72 | 65 76 69 73 69 6f 6e 73 |ectory-r|evisions|
|000013e0| 27 0a 09 60 65 64 69 72 | 2d 72 65 76 69 73 69 6f |'..`edir|-revisio|
|000013f0| 6e 73 27 0a 09 60 65 64 | 69 66 66 2d 6d 65 72 67 |ns'..`ed|iff-merg|
|00001400| 65 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |e-direct|ory-revi|
|00001410| 73 69 6f 6e 73 27 0a 09 | 60 65 64 69 72 2d 6d 65 |sions'..|`edir-me|
|00001420| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 27 0a 09 |rge-revi|sions'..|
|00001430| 60 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 |`ediff-m|erge-dir|
|00001440| 65 63 74 6f 72 79 2d 72 | 65 76 69 73 69 6f 6e 73 |ectory-r|evisions|
|00001450| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 27 0a |-with-an|cestor'.|
|00001460| 09 60 65 64 69 72 2d 6d | 65 72 67 65 2d 72 65 76 |.`edir-m|erge-rev|
|00001470| 69 73 69 6f 6e 73 2d 77 | 69 74 68 2d 61 6e 63 65 |isions-w|ith-ance|
|00001480| 73 74 6f 72 27 0a 0a 43 | 6f 6d 6d 61 6e 64 73 3a |stor'..C|ommands:|
|00001490| 0a 5c 5c 7b 65 64 69 66 | 66 2d 6d 65 74 61 2d 62 |.\\{edif|f-meta-b|
|000014a0| 75 66 66 65 72 2d 6d 61 | 70 7d 22 5d 29 0a 28 62 |uffer-ma|p}"]).(b|
|000014b0| 79 74 65 2d 63 6f 64 65 | 20 22 c0 09 21 88 c2 09 |yte-code| "..!...|
|000014c0| c3 c4 23 88 c2 09 c5 c6 | 23 88 c2 09 c7 c8 23 88 |..#.....|#.....#.|
|000014d0| c2 09 c9 c8 23 88 c2 09 | ca c8 23 87 22 20 5b 73 |....#...|..#." [s|
|000014e0| 75 70 70 72 65 73 73 2d | 6b 65 79 6d 61 70 20 65 |uppress-|keymap e|
|000014f0| 64 69 66 66 2d 64 69 72 | 2d 64 69 66 66 73 2d 62 |diff-dir|-diffs-b|
|00001500| 75 66 66 65 72 2d 6d 61 | 70 20 64 65 66 69 6e 65 |uffer-ma|p define|
|00001510| 2d 6b 65 79 20 22 71 22 | 20 65 64 69 66 66 2d 62 |-key "q"| ediff-b|
|00001520| 75 72 79 2d 64 69 72 2d | 64 69 66 66 73 2d 62 75 |ury-dir-|diffs-bu|
|00001530| 66 66 65 72 20 22 20 22 | 20 6e 65 78 74 2d 6c 69 |ffer " "| next-li|
|00001540| 6e 65 20 22 7f 22 20 70 | 72 65 76 69 6f 75 73 2d |ne "." p|revious-|
|00001550| 6c 69 6e 65 20 5b 64 65 | 6c 65 74 65 5d 20 5b 62 |line [de|lete] [b|
|00001560| 61 63 6b 73 70 61 63 65 | 5d 5d 20 34 29 0a 28 66 |ackspace|]] 4).(f|
|00001570| 73 65 74 20 27 65 64 69 | 66 66 2d 6e 65 78 74 2d |set 'edi|ff-next-|
|00001580| 6d 65 74 61 2d 69 74 65 | 6d 20 23 5b 28 63 6f 75 |meta-ite|m #[(cou|
|00001590| 6e 74 29 20 22 08 ac 82 | c1 10 c2 08 57 ad 88 08 |nt) "...|....W...|
|000015a0| 53 10 c3 20 88 aa 73 87 | 22 20 5b 63 6f 75 6e 74 |S.. ..s.|" [count|
|000015b0| 20 31 20 30 20 65 64 69 | 66 66 2d 6e 65 78 74 2d | 1 0 edi|ff-next-|
|000015c0| 6d 65 74 61 2d 69 74 65 | 6d 31 5d 20 32 20 22 5c |meta-ite|m1] 2 "\|
|000015d0| 0a 4d 6f 76 65 20 74 6f | 20 74 68 65 20 6e 65 78 |.Move to| the nex|
|000015e0| 74 20 69 74 65 6d 20 69 | 6e 20 45 64 69 66 66 20 |t item i|n Ediff |
|000015f0| 72 65 67 69 73 74 72 79 | 20 6f 72 20 73 65 73 73 |registry| or sess|
|00001600| 69 6f 6e 20 67 72 6f 75 | 70 20 62 75 66 66 65 72 |ion grou|p buffer|
|00001610| 2e 0a 4d 6f 76 65 73 20 | 69 6e 20 63 69 72 63 75 |..Moves |in circu|
|00001620| 6c 61 72 20 66 61 73 68 | 69 6f 6e 2e 20 57 69 74 |lar fash|ion. Wit|
|00001630| 68 20 6e 75 6d 65 72 69 | 63 20 70 72 65 66 69 78 |h numeri|c prefix|
|00001640| 20 61 72 67 2c 20 73 6b | 69 70 20 74 68 69 73 20 | arg, sk|ip this |
|00001650| 6d 61 6e 79 20 69 74 65 | 6d 73 2e 22 20 22 70 22 |many ite|ms." "p"|
|00001660| 5d 29 0a 28 66 73 65 74 | 20 27 65 64 69 66 66 2d |]).(fset| 'ediff-|
|00001670| 6e 65 78 74 2d 6d 65 74 | 61 2d 69 74 65 6d 31 20 |next-met|a-item1 |
|00001680| 23 5b 6e 69 6c 20 22 c0 | 19 c2 60 21 89 11 ab 83 |#[nil ".|..`!....|
|00001690| 09 62 88 0b c4 3d ab 8c | c5 c6 c0 c7 23 ad 8f c8 |.b...=..|....#...|
|000016a0| c0 78 aa 8a c9 c0 77 ca | 56 ad 83 cb cc 21 29 87 |.x....w.|V....!).|
|000016b0| 22 20 5b 6e 69 6c 20 70 | 6f 73 20 65 64 69 66 66 |" [nil p|os ediff|
|000016c0| 2d 6e 65 78 74 2d 6d 65 | 74 61 2d 6f 76 65 72 6c |-next-me|ta-overl|
|000016d0| 61 79 2d 73 74 61 72 74 | 20 65 64 69 66 66 2d 6d |ay-start| ediff-m|
|000016e0| 65 74 61 6a 6f 62 2d 6e | 61 6d 65 20 65 64 69 66 |etajob-n|ame edif|
|000016f0| 66 2d 72 65 67 69 73 74 | 72 79 20 73 65 61 72 63 |f-regist|ry searc|
|00001700| 68 2d 66 6f 72 77 61 72 | 64 20 22 2a 45 64 69 66 |h-forwar|d "*Edif|
|00001710| 66 22 20 74 20 22 61 2d | 7a 41 2d 5a 2a 22 20 22 |f" t "a-|zA-Z*" "|
|00001720| 2d 2b 3f 48 2a 20 09 30 | 2d 39 22 20 30 20 62 61 |-+?H* .0|-9" 0 ba|
|00001730| 63 6b 77 61 72 64 2d 63 | 68 61 72 20 31 5d 20 35 |ckward-c|har 1] 5|
|00001740| 5d 29 0a 28 66 73 65 74 | 20 27 65 64 69 66 66 2d |]).(fset| 'ediff-|
|00001750| 70 72 65 76 69 6f 75 73 | 2d 6d 65 74 61 2d 69 74 |previous|-meta-it|
|00001760| 65 6d 20 23 5b 28 63 6f | 75 6e 74 29 20 22 08 ac |em #[(co|unt) "..|
|00001770| 82 c1 10 c2 08 57 ad 88 | 08 53 10 c3 20 88 aa 73 |.....W..|.S.. ..s|
|00001780| 87 22 20 5b 63 6f 75 6e | 74 20 31 20 30 20 65 64 |." [coun|t 1 0 ed|
|00001790| 69 66 66 2d 70 72 65 76 | 69 6f 75 73 2d 6d 65 74 |iff-prev|ious-met|
|000017a0| 61 2d 69 74 65 6d 31 5d | 20 32 20 22 5c 0a 4d 6f |a-item1]| 2 "\.Mo|
|000017b0| 76 65 20 74 6f 20 74 68 | 65 20 70 72 65 76 69 6f |ve to th|e previo|
|000017c0| 75 73 20 69 74 65 6d 20 | 69 6e 20 45 64 69 66 66 |us item |in Ediff|
|000017d0| 20 72 65 67 69 73 74 72 | 79 20 6f 72 20 73 65 73 | registr|y or ses|
|000017e0| 73 69 6f 6e 20 67 72 6f | 75 70 20 62 75 66 66 65 |sion gro|up buffe|
|000017f0| 72 2e 0a 4d 6f 76 65 73 | 20 69 6e 20 63 69 72 63 |r..Moves| in circ|
|00001800| 75 6c 61 72 20 66 61 73 | 68 69 6f 6e 2e 20 57 69 |ular fas|hion. Wi|
|00001810| 74 68 20 6e 75 6d 65 72 | 69 63 20 70 72 65 66 69 |th numer|ic prefi|
|00001820| 78 20 61 72 67 2c 20 73 | 6b 69 70 20 74 68 69 73 |x arg, s|kip this|
|00001830| 20 6d 61 6e 79 20 69 74 | 65 6d 73 2e 22 20 22 70 | many it|ems." "p|
|00001840| 22 5d 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |"]).(byt|e-code "|
|00001850| c0 c1 4d 88 c2 c3 4d 88 | c4 c5 4d 88 c6 c7 4d 88 |..M...M.|..M...M.|
|00001860| c8 c9 4d 88 ca cb 4d 88 | cc cd 4d 88 ce cf 4d 87 |..M...M.|..M...M.|
|00001870| 22 20 5b 65 64 69 66 66 | 2d 70 72 65 76 69 6f 75 |" [ediff|-previou|
|00001880| 73 2d 6d 65 74 61 2d 69 | 74 65 6d 31 20 23 5b 6e |s-meta-i|tem1 #[n|
|00001890| 69 6c 20 22 c0 19 c2 60 | 21 89 11 ab 83 09 62 88 |il "...`|!.....b.|
|000018a0| 0b c4 3d ab 8c c5 c6 c0 | c7 23 ad 8f c8 c0 78 aa |..=.....|.#....x.|
|000018b0| 8a c9 c0 77 ca 56 ad 83 | cb cc 21 29 87 22 20 5b |...w.V..|..!)." [|
|000018c0| 6e 69 6c 20 70 6f 73 20 | 65 64 69 66 66 2d 70 72 |nil pos |ediff-pr|
|000018d0| 65 76 69 6f 75 73 2d 6d | 65 74 61 2d 6f 76 65 72 |evious-m|eta-over|
|000018e0| 6c 61 79 2d 73 74 61 72 | 74 20 65 64 69 66 66 2d |lay-star|t ediff-|
|000018f0| 6d 65 74 61 6a 6f 62 2d | 6e 61 6d 65 20 65 64 69 |metajob-|name edi|
|00001900| 66 66 2d 72 65 67 69 73 | 74 72 79 20 73 65 61 72 |ff-regis|try sear|
|00001910| 63 68 2d 66 6f 72 77 61 | 72 64 20 22 2a 45 64 69 |ch-forwa|rd "*Edi|
|00001920| 66 66 22 20 74 20 22 61 | 2d 7a 41 2d 5a 2a 22 20 |ff" t "a|-zA-Z*" |
|00001930| 22 2d 2b 3f 48 2a 20 09 | 30 2d 39 22 20 30 20 62 |"-+?H* .|0-9" 0 b|
|00001940| 61 63 6b 77 61 72 64 2d | 63 68 61 72 20 31 5d 20 |ackward-|char 1] |
|00001950| 35 5d 20 65 64 69 66 66 | 2d 69 6e 74 65 72 73 65 |5] ediff|-interse|
|00001960| 63 74 2d 64 69 72 65 63 | 74 6f 72 69 65 73 20 23 |ct-direc|tories #|
|00001970| 5b 28 6a 6f 62 6e 61 6d | 65 20 64 69 66 66 2d 76 |[(jobnam|e diff-v|
|00001980| 61 72 20 72 65 67 65 78 | 70 20 64 69 72 31 20 64 |ar regex|p dir1 d|
|00001990| 69 72 32 20 26 6f 70 74 | 69 6f 6e 61 6c 20 64 69 |ir2 &opt|ional di|
|000019a0| 72 33 20 63 6f 6d 70 61 | 72 69 73 6f 6e 2d 66 75 |r3 compa|rison-fu|
|000019b0| 6e 63 29 20 22 c0 c1 21 | 88 5c 6e ae 81 c3 12 c4 |nc) "..!|.\n.....|
|000019c0| 89 89 89 89 89 89 89 1d | 1e 06 1e 07 1e 08 1e 09 |........|........|
|000019d0| 1e 5c 6e 1e 0b 1e 0c cd | 0e 0e 21 16 08 cf 0e 08 |.\n.....|..!.....|
|000019e0| c4 0e 10 23 16 0c cd 0e | 11 21 16 07 cf 0e 07 c4 |...#....|.!......|
|000019f0| 0e 10 23 16 0b 0e 12 3b | ab 8f cd 0e 12 21 16 06 |..#....;|.....!..|
|00001a00| cf 0e 06 c4 0e 10 23 16 | 5c 6e d3 d4 0e 0c 5c 22 |......#.|\n....\"|
|00001a10| 16 0c d3 d5 0e 0c 5c 22 | 16 0c d6 0e 0c 0e 0b d7 |......\"|........|
|00001a20| 5c 6e 24 16 09 d8 d9 0e | 09 5c 22 88 0e 5c 6e ab |\n$.....|.\"..\n.|
|00001a30| 8a d6 0e 09 0e 5c 6e d7 | 5c 6e 24 16 09 0e 1a 89 |.....\n.|\n$.....|
|00001a40| 1e 1b ae 82 0e 1c dd 3e | 29 ab 86 d8 de 0e 09 5c |.......>|)......\|
|00001a50| 22 88 df e0 0e 09 21 e1 | 5c 22 16 09 e2 e3 89 0e |".....!.|\"......|
|00001a60| 0c 0e 0b d7 5c 6e 24 0e | 5c 6e d7 5c 6e 24 0e 09 |....\n$.|\n.\n$..|
|00001a70| d7 5c 6e 24 15 d3 d4 0d | 5c 22 15 df e0 d3 d5 0d |.\n$....|\"......|
|00001a80| 5c 22 21 e1 5c 22 15 d8 | e4 0d 5c 22 15 d8 e5 0d |\"!.\"..|..\"....|
|00001a90| 5c 22 88 0e 10 0e 08 0e | 07 0e 06 46 0d 42 15 0e |\"......|...F.B..|
|00001aa0| 26 0d 4c 88 0e 10 0e 08 | 0e 07 0e 06 46 d8 e7 0e |&.L.....|....F...|
|00001ab0| 09 5c 22 2e 08 42 87 22 | 20 5b 72 65 71 75 69 72 |.\"..B."| [requir|
|00001ac0| 65 20 63 6c 20 63 6f 6d | 70 61 72 69 73 6f 6e 2d |e cl com|parison-|
|00001ad0| 66 75 6e 63 20 73 74 72 | 69 6e 67 3d 20 6e 69 6c |func str|ing= nil|
|00001ae0| 20 64 69 66 66 6c 69 73 | 74 20 61 75 78 64 69 72 | difflis|t auxdir|
|00001af0| 33 20 61 75 78 64 69 72 | 32 20 61 75 78 64 69 72 |3 auxdir|2 auxdir|
|00001b00| 31 20 63 6f 6d 6d 6f 6e | 20 6c 69 73 33 20 6c 69 |1 common| lis3 li|
|00001b10| 73 32 20 6c 69 73 31 20 | 66 69 6c 65 2d 6e 61 6d |s2 lis1 |file-nam|
|00001b20| 65 2d 61 73 2d 64 69 72 | 65 63 74 6f 72 79 20 64 |e-as-dir|ectory d|
|00001b30| 69 72 31 20 64 69 72 65 | 63 74 6f 72 79 2d 66 69 |ir1 dire|ctory-fi|
|00001b40| 6c 65 73 20 72 65 67 65 | 78 70 20 64 69 72 32 20 |les rege|xp dir2 |
|00001b50| 64 69 72 33 20 64 65 6c | 65 74 65 20 22 2e 22 20 |dir3 del|ete "." |
|00001b60| 22 2e 2e 22 20 69 6e 74 | 65 72 73 65 63 74 69 6f |".." int|ersectio|
|00001b70| 6e 20 3a 74 65 73 74 20 | 6d 61 70 63 61 72 20 23 |n :test |mapcar #|
|00001b80| 5b 28 65 6c 74 29 20 22 | c0 09 5c 6e 50 21 c0 0b |[(elt) "|..\nP!..|
|00001b90| 5c 6e 50 21 1c 89 1d ab | 84 0c 3f ae 85 0d 3f ad |\nP!....|..?...?.|
|00001ba0| 81 0c 2a ad 88 c6 5c 6e | 0e 07 5c 22 89 16 07 87 |..*...\n|..\"....|
|00001bb0| 22 20 5b 66 69 6c 65 2d | 64 69 72 65 63 74 6f 72 |" [file-|director|
|00001bc0| 79 2d 70 20 61 75 78 64 | 69 72 31 20 65 6c 74 20 |y-p auxd|ir1 elt |
|00001bd0| 61 75 78 64 69 72 32 20 | 62 20 61 20 64 65 6c 71 |auxdir2 |b a delq|
|00001be0| 20 63 6f 6d 6d 6f 6e 5d | 20 35 5d 20 6a 6f 62 6e | common]| 5] jobn|
|00001bf0| 61 6d 65 20 6d 65 74 61 | 6a 6f 62 20 65 64 69 66 |ame meta|job edif|
|00001c00| 66 2d 6d 65 74 61 6a 6f | 62 2d 6e 61 6d 65 20 28 |f-metajo|b-name (|
|00001c10| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 69 65 |ediff-di|rectorie|
|00001c20| 73 33 20 65 64 69 66 66 | 2d 66 69 6c 65 67 72 6f |s3 ediff|-filegro|
|00001c30| 75 70 73 33 29 20 23 5b | 28 65 6c 74 29 20 22 c0 |ups3) #[|(elt) ".|
|00001c40| 09 5c 6e 50 21 c0 0b 5c | 6e 50 21 1c 89 1d ab 84 |.\nP!..\|nP!.....|
|00001c50| 0c 3f ae 85 0d 3f ad 81 | 0c 2a ad 88 c6 5c 6e 0e |.?...?..|.*...\n.|
|00001c60| 07 5c 22 89 16 07 87 22 | 20 5b 66 69 6c 65 2d 64 |.\"...."| [file-d|
|00001c70| 69 72 65 63 74 6f 72 79 | 2d 70 20 61 75 78 64 69 |irectory|-p auxdi|
|00001c80| 72 31 20 65 6c 74 20 61 | 75 78 64 69 72 33 20 62 |r1 elt a|uxdir3 b|
|00001c90| 20 61 20 64 65 6c 71 20 | 63 6f 6d 6d 6f 6e 5d 20 | a delq |common] |
|00001ca0| 35 5d 20 73 6f 72 74 20 | 63 6f 70 79 2d 6c 69 73 |5] sort |copy-lis|
|00001cb0| 74 20 73 74 72 69 6e 67 | 2d 6c 65 73 73 70 20 73 |t string|-lessp s|
|00001cc0| 65 74 2d 64 69 66 66 65 | 72 65 6e 63 65 20 75 6e |et-diffe|rence un|
|00001cd0| 69 6f 6e 20 23 5b 28 65 | 6c 74 29 20 22 08 c1 42 |ion #[(e|lt) "..B|
|00001ce0| 87 22 20 5b 65 6c 74 20 | 31 5d 20 32 5d 20 23 5b |." [elt |1] 2] #[|
|00001cf0| 28 65 6c 74 29 20 22 08 | 40 09 9d ab 87 08 89 41 |(elt) ".|@......A|
|00001d00| c2 5f a1 88 08 40 0b 9d | ab 87 08 89 41 c4 5f a1 |._...@..|....A._.|
|00001d10| 88 08 40 0d 9d ad 86 08 | 89 41 c6 5f a1 87 22 20 |..@.....|.A._.." |
|00001d20| 5b 65 6c 74 20 6c 69 73 | 31 20 32 20 6c 69 73 32 |[elt lis|1 2 lis2|
|00001d30| 20 33 20 6c 69 73 33 20 | 35 5d 20 33 5d 20 64 69 | 3 lis3 |5] 3] di|
|00001d40| 66 66 2d 76 61 72 20 23 | 5b 28 65 6c 74 29 20 22 |ff-var #|[(elt) "|
|00001d50| 08 09 50 5c 6e 09 50 0b | ad 83 0c 09 50 45 87 22 |..P\n.P.|....PE."|
|00001d60| 20 5b 61 75 78 64 69 72 | 31 20 65 6c 74 20 61 75 | [auxdir|1 elt au|
|00001d70| 78 64 69 72 32 20 6c 69 | 73 33 20 61 75 78 64 69 |xdir2 li|s3 auxdi|
|00001d80| 72 33 5d 20 34 5d 5d 20 | 39 5d 20 65 64 69 66 66 |r3] 4]] |9] ediff|
|00001d90| 2d 67 65 74 2d 64 69 72 | 65 63 74 6f 72 79 2d 66 |-get-dir|ectory-f|
|00001da0| 69 6c 65 73 2d 75 6e 64 | 65 72 2d 72 65 76 69 73 |iles-und|er-revis|
|00001db0| 69 6f 6e 20 23 5b 28 6a | 6f 62 6e 61 6d 65 20 72 |ion #[(j|obname r|
|00001dc0| 65 67 65 78 70 20 64 69 | 72 31 29 20 22 c0 c1 21 |egexp di|r1) "..!|
|00001dd0| 88 c2 89 89 89 1b 1c 1d | 1e 06 c7 0e 08 21 13 c9 |........|.....!..|
|00001de0| 0b c2 0e 5c 6e 23 16 06 | 0e 06 ab a4 0e 06 40 15 |...\n#..|......@.|
|00001df0| 0e 06 41 16 06 cb 0b 0d | 50 21 ab 86 0d 0c 42 14 |..A.....|P!....B.|
|00001e00| aa 66 cc 0b 0d cd 51 21 | ab 5e 0d 0c 42 14 aa 58 |.f....Q!|.^..B..X|
|00001e10| ce cf 0c 5c 22 14 ce d0 | 0c 5c 22 14 d1 d2 0c 21 |...\"...|.\"....!|
|00001e20| d3 5c 22 14 0e 5c 6e 0b | c2 89 46 d4 d5 0c 5c 22 |.\"..\n.|..F...\"|
|00001e30| 2c 42 87 22 20 5b 72 65 | 71 75 69 72 65 20 63 6c |,B." [re|quire cl|
|00001e40| 20 6e 69 6c 20 61 75 78 | 64 69 72 31 20 63 6f 6d | nil aux|dir1 com|
|00001e50| 6d 6f 6e 20 65 6c 74 20 | 6c 69 73 31 20 66 69 6c |mon elt |lis1 fil|
|00001e60| 65 2d 6e 61 6d 65 2d 61 | 73 2d 64 69 72 65 63 74 |e-name-a|s-direct|
|00001e70| 6f 72 79 20 64 69 72 31 | 20 64 69 72 65 63 74 6f |ory dir1| directo|
|00001e80| 72 79 2d 66 69 6c 65 73 | 20 72 65 67 65 78 70 20 |ry-files| regexp |
|00001e90| 66 69 6c 65 2d 64 69 72 | 65 63 74 6f 72 79 2d 70 |file-dir|ectory-p|
|00001ea0| 20 66 69 6c 65 2d 65 78 | 69 73 74 73 2d 70 20 22 | file-ex|ists-p "|
|00001eb0| 2c 76 22 20 64 65 6c 65 | 74 65 20 22 2e 22 20 22 |,v" dele|te "." "|
|00001ec0| 2e 2e 22 20 73 6f 72 74 | 20 63 6f 70 79 2d 6c 69 |.." sort| copy-li|
|00001ed0| 73 74 20 73 74 72 69 6e | 67 2d 6c 65 73 73 70 20 |st strin|g-lessp |
|00001ee0| 6d 61 70 63 61 72 20 23 | 5b 28 65 6c 74 29 20 22 |mapcar #|[(elt) "|
|00001ef0| 08 09 50 c2 89 45 87 22 | 20 5b 61 75 78 64 69 72 |..P..E."| [auxdir|
|00001f00| 31 20 65 6c 74 20 6e 69 | 6c 5d 20 33 5d 5d 20 34 |1 elt ni|l] 3]] 4|
|00001f10| 5d 20 65 64 69 66 66 2d | 70 72 65 70 61 72 65 2d |] ediff-|prepare-|
|00001f20| 6d 65 74 61 2d 62 75 66 | 66 65 72 20 23 5b 28 61 |meta-buf|fer #[(a|
|00001f30| 63 74 69 6f 6e 2d 66 75 | 6e 63 20 6d 65 74 61 2d |ction-fu|nc meta-|
|00001f40| 6c 69 73 74 20 6d 65 74 | 61 2d 62 75 66 66 65 72 |list met|a-buffer|
|00001f50| 2d 6e 61 6d 65 20 72 65 | 64 72 61 77 2d 66 75 6e |-name re|draw-fun|
|00001f60| 63 74 69 6f 6e 20 6a 6f | 62 6e 61 6d 65 20 26 6f |ction jo|bname &o|
|00001f70| 70 74 69 6f 6e 61 6c 20 | 73 74 61 72 74 75 70 2d |ptional |startup-|
|00001f80| 68 6f 6f 6b 73 29 20 22 | c0 09 c2 5c 22 19 c3 09 |hooks) "|...\"...|
|00001f90| 21 1c 70 1d 0c 83 e2 00 | c6 0c 21 83 e2 00 c7 c6 |!.p.....|..!.....|
|00001fa0| 0c 21 21 83 e2 00 c8 8e | 0c 71 88 c9 20 88 0e 5c |.!!.....|.q.. ..\|
|00001fb0| 6e 16 0b 0e 0c 16 0d 0e | 0e 16 0f 0c 16 10 d1 20 |n.......|....... |
|00001fc0| 88 0e 0f d2 3d ab 90 0c | 16 13 0e 14 16 15 d6 0e |....=...|........|
|00001fd0| 17 d8 d9 23 88 aa 8e 0c | 0e 14 40 42 da db 0e 14 |...#....|..@B....|
|00001fe0| 41 5c 22 42 16 15 0c 0e | 13 3d ac 86 0c 0e 1c 42 |A\"B....|.=.....B|
|00001ff0| 16 1c 0e 0c 0e 15 21 88 | dd 16 1e df e0 21 88 e1 |......!.|.....!..|
|00002000| e2 21 88 0e 5c 6e e3 3d | ab d1 0c 0e 24 40 42 0e |.!..\n.=|....$@B.|
|00002010| 24 41 42 16 24 e5 0e 0e | 21 ac 85 e6 0e 24 21 88 |$AB.$...|!....$!.|
|00002020| d6 0e 17 e7 e8 23 88 d6 | 0e 17 e9 ea 23 88 d6 0e |.....#..|....#...|
|00002030| 17 eb ec 23 88 0e 0e 1e | 2d ee 0e 2d 21 ae 84 0e |...#....|-..-!...|
|00002040| 0f ef 3e 29 ab 87 d6 0e | 17 f0 f1 23 88 d6 0e 17 |..>)....|...#....|
|00002050| f2 f3 23 88 d6 0e 17 f4 | f5 23 88 0e 0f d2 3d ab |..#.....|.#....=.|
|00002060| 86 e1 f6 21 88 aa 84 e1 | f7 21 88 29 aa 8a 0e 38 |...!....|.!.)...8|
|00002070| f9 3d ac 84 fa fb 21 88 | 29 0c 2a 87 22 20 5b 65 |.=....!.|).*." [e|
|00002080| 64 69 66 66 2d 75 6e 69 | 71 75 65 2d 62 75 66 66 |diff-uni|que-buff|
|00002090| 65 72 2d 6e 61 6d 65 20 | 6d 65 74 61 2d 62 75 66 |er-name |meta-buf|
|000020a0| 66 65 72 2d 6e 61 6d 65 | 20 22 2a 22 20 67 65 74 |fer-name| "*" get|
|000020b0| 2d 62 75 66 66 65 72 2d | 63 72 65 61 74 65 20 6d |-buffer-|create m|
|000020c0| 65 74 61 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |eta-buff|er Start|
|000020d0| 42 75 66 66 65 72 20 67 | 65 74 2d 62 75 66 66 65 |Buffer g|et-buffe|
|000020e0| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 28 28 |r buffer|-name ((|
|000020f0| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00002100| 42 75 66 66 65 72 29 29 | 20 65 64 69 66 66 2d 6d |Buffer))| ediff-m|
|00002110| 65 74 61 2d 6d 6f 64 65 | 20 61 63 74 69 6f 6e 2d |eta-mode| action-|
|00002120| 66 75 6e 63 20 65 64 69 | 66 66 2d 6d 65 74 61 2d |func edi|ff-meta-|
|00002130| 61 63 74 69 6f 6e 2d 66 | 75 6e 63 74 69 6f 6e 20 |action-f|unction |
|00002140| 72 65 64 72 61 77 2d 66 | 75 6e 63 74 69 6f 6e 20 |redraw-f|unction |
|00002150| 65 64 69 66 66 2d 6d 65 | 74 61 2d 72 65 64 72 61 |ediff-me|ta-redra|
|00002160| 77 2d 66 75 6e 63 74 69 | 6f 6e 20 6a 6f 62 6e 61 |w-functi|on jobna|
|00002170| 6d 65 20 65 64 69 66 66 | 2d 6d 65 74 61 6a 6f 62 |me ediff|-metajob|
|00002180| 2d 6e 61 6d 65 20 65 64 | 69 66 66 2d 6d 65 74 61 |-name ed|iff-meta|
|00002190| 2d 62 75 66 66 65 72 20 | 65 64 69 66 66 2d 73 65 |-buffer |ediff-se|
|000021a0| 74 75 70 2d 6d 65 74 61 | 2d 6d 61 70 20 65 64 69 |tup-meta|-map edi|
|000021b0| 66 66 2d 72 65 67 69 73 | 74 72 79 20 65 64 69 66 |ff-regis|try edif|
|000021c0| 66 2d 72 65 67 69 73 74 | 72 79 2d 62 75 66 66 65 |f-regist|ry-buffe|
|000021d0| 72 20 6d 65 74 61 2d 6c | 69 73 74 20 65 64 69 66 |r meta-l|ist edif|
|000021e0| 66 2d 6d 65 74 61 2d 6c | 69 73 74 20 64 65 66 69 |f-meta-l|ist defi|
|000021f0| 6e 65 2d 6b 65 79 20 65 | 64 69 66 66 2d 6d 65 74 |ne-key e|diff-met|
|00002200| 61 2d 62 75 66 66 65 72 | 2d 6d 61 70 20 22 4d 22 |a-buffer|-map "M"|
|00002210| 20 65 64 69 66 66 2d 73 | 68 6f 77 2d 6d 65 74 61 | ediff-s|how-meta|
|00002220| 2d 62 75 66 66 2d 66 72 | 6f 6d 2d 72 65 67 69 73 |-buff-fr|om-regis|
|00002230| 74 72 79 20 6d 61 70 63 | 61 72 20 23 5b 28 65 6c |try mapc|ar #[(el|
|00002240| 74 29 20 22 c0 89 09 42 | 42 87 22 20 5b 6e 69 6c |t) "...B|B." [nil|
|00002250| 20 65 6c 74 5d 20 33 5d | 20 65 64 69 66 66 2d 73 | elt] 3]| ediff-s|
|00002260| 65 73 73 69 6f 6e 2d 72 | 65 67 69 73 74 72 79 20 |ession-r|egistry |
|00002270| 74 20 62 75 66 66 65 72 | 2d 72 65 61 64 2d 6f 6e |t buffer|-read-on|
|00002280| 6c 79 20 73 65 74 2d 62 | 75 66 66 65 72 2d 6d 6f |ly set-b|uffer-mo|
|00002290| 64 69 66 69 65 64 2d 70 | 20 6e 69 6c 20 72 75 6e |dified-p| nil run|
|000022a0| 2d 68 6f 6f 6b 73 20 73 | 74 61 72 74 75 70 2d 68 |-hooks s|tartup-h|
|000022b0| 6f 6f 6b 73 20 65 64 69 | 66 66 2d 64 69 72 2d 61 |ooks edi|ff-dir-a|
|000022c0| 63 74 69 6f 6e 20 65 64 | 69 66 66 2d 64 69 72 2d |ction ed|iff-dir-|
|000022d0| 64 69 66 66 65 72 65 6e | 63 65 2d 6c 69 73 74 20 |differen|ce-list |
|000022e0| 65 64 69 66 66 2d 64 69 | 72 31 2d 6d 65 74 61 6a |ediff-di|r1-metaj|
|000022f0| 6f 62 20 65 64 69 66 66 | 2d 64 72 61 77 2d 64 69 |ob ediff|-draw-di|
|00002300| 72 2d 64 69 66 66 73 20 | 22 68 22 20 65 64 69 66 |r-diffs |"h" edif|
|00002310| 66 2d 6d 61 72 6b 2d 66 | 6f 72 2d 68 69 64 69 6e |f-mark-f|or-hidin|
|00002320| 67 20 22 78 22 20 65 64 | 69 66 66 2d 68 69 64 65 |g "x" ed|iff-hide|
|00002330| 2d 6d 61 72 6b 65 64 2d | 73 65 73 73 69 6f 6e 73 |-marked-|sessions|
|00002340| 20 22 6d 22 20 65 64 69 | 66 66 2d 6d 61 72 6b 2d | "m" edi|ff-mark-|
|00002350| 66 6f 72 2d 6f 70 65 72 | 61 74 69 6f 6e 20 6d 65 |for-oper|ation me|
|00002360| 74 61 6a 6f 62 20 65 64 | 69 66 66 2d 72 65 76 69 |tajob ed|iff-revi|
|00002370| 73 69 6f 6e 2d 6d 65 74 | 61 6a 6f 62 20 28 65 64 |sion-met|ajob (ed|
|00002380| 69 66 66 2d 64 69 72 65 | 63 74 6f 72 69 65 73 20 |iff-dire|ctories |
|00002390| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 79 2d |ediff-di|rectory-|
|000023a0| 72 65 76 69 73 69 6f 6e | 73 29 20 22 50 22 20 65 |revision|s) "P" e|
|000023b0| 64 69 66 66 2d 63 6f 6c | 6c 65 63 74 2d 63 75 73 |diff-col|lect-cus|
|000023c0| 74 6f 6d 2d 64 69 66 66 | 73 20 22 75 22 20 65 64 |tom-diff|s "u" ed|
|000023d0| 69 66 66 2d 75 70 2d 6d | 65 74 61 2d 68 69 65 72 |iff-up-m|eta-hier|
|000023e0| 61 72 63 68 79 20 22 44 | 22 20 65 64 69 66 66 2d |archy "D|" ediff-|
|000023f0| 73 68 6f 77 2d 64 69 72 | 2d 64 69 66 66 73 20 65 |show-dir|-diffs e|
|00002400| 64 69 66 66 2d 72 65 67 | 69 73 74 72 79 2d 73 65 |diff-reg|istry-se|
|00002410| 74 75 70 2d 68 6f 6f 6b | 73 20 65 64 69 66 66 2d |tup-hook|s ediff-|
|00002420| 73 65 73 73 69 6f 6e 2d | 67 72 6f 75 70 2d 73 65 |session-|group-se|
|00002430| 74 75 70 2d 68 6f 6f 6b | 73 20 74 68 69 73 2d 63 |tup-hook|s this-c|
|00002440| 6f 6d 6d 61 6e 64 20 65 | 64 69 66 66 2d 71 75 69 |ommand e|diff-qui|
|00002450| 74 20 65 72 72 6f 72 20 | 22 59 6f 75 27 76 65 20 |t error |"You've |
|00002460| 6b 69 6c 6c 65 64 20 61 | 6e 20 65 73 73 65 6e 74 |killed a|n essent|
|00002470| 69 61 6c 20 45 64 69 66 | 66 20 62 75 66 66 65 72 |ial Edif|f buffer|
|00002480| 2d 2d 2d 50 6c 65 61 73 | 65 20 71 75 69 74 20 45 |---Pleas|e quit E|
|00002490| 64 69 66 66 22 5d 20 34 | 5d 20 65 64 69 66 66 2d |diff"] 4|] ediff-|
|000024a0| 72 65 64 72 61 77 2d 64 | 69 72 65 63 74 6f 72 79 |redraw-d|irectory|
|000024b0| 2d 67 72 6f 75 70 2d 62 | 75 66 66 65 72 20 23 5b |-group-b|uffer #[|
|000024c0| 28 6d 65 74 61 2d 6c 69 | 73 74 29 20 22 c0 09 21 |(meta-li|st) "..!|
|000024d0| c2 c3 c4 89 89 89 89 89 | 89 89 89 89 1d 1e 06 1e |........|........|
|000024e0| 07 1e 08 1e 09 1e 5c 6e | 1e 0b 1e 0c 1e 0d 1e 0e |......\n|........|
|000024f0| 1e 0f 1e 10 1e 11 70 1e | 12 0e 11 83 3d 01 d3 0e |......p.|....=...|
|00002500| 11 21 83 3d 01 d4 d3 0e | 11 21 21 83 3d 01 d5 8e |.!.=....|.!!.=...|
|00002510| 0e 11 71 88 60 16 07 d6 | 20 88 d7 0e 18 d9 0e 1a |..q.`...| .......|
|00002520| 21 5c 22 63 88 db 09 21 | 16 0e c4 1e 1c dd 0e 1c |!\"c...!|........|
|00002530| 21 ae 84 0e 1a de 3e 29 | ab 83 df 63 88 e0 63 88 |!.....>)|...c..c.|
|00002540| 0e 0e 3b ab 8e 0e 0e 47 | c3 56 ab 87 d7 e1 0e 0e |..;....G|.V......|
|00002550| 5c 22 63 88 e2 63 88 09 | 41 89 11 89 16 06 ab 9d |\"c..c..|A.......|
|00002560| 0e 10 ab 99 0e 06 40 ab | 8c e3 0e 06 40 21 e4 3d |......@.|....@!.=|
|00002570| ac 83 c4 16 10 0e 06 41 | 89 16 06 ac 63 0e 10 ab |.......A|....c...|
|00002580| 83 e5 63 88 09 ab f9 09 | 40 16 0d 09 41 11 0e 0f |..c.....|@...A...|
|00002590| 54 16 0f e3 0e 0d 21 e4 | 3d ac 69 e6 0e 0d 21 16 |T.....!.|=.i...!.|
|000025a0| 0c e7 0e 0d 21 16 0b e8 | 0e 0d 21 16 5c 6e e9 0e |....!...|..!.\n..|
|000025b0| 0d 21 16 09 60 16 08 0e | 0c ac 83 ea aa 96 0e 0c |.!..`...|........|
|000025c0| ab 91 d3 0e 0c 21 ab 8b | d4 d3 0e 0c 21 21 ab 83 |.....!..|....!!..|
|000025d0| eb aa 81 ec 63 88 e3 0e | 0d 21 ae 81 ea 63 88 ed |....c...|.!...c..|
|000025e0| ee 0e 0f 21 ef b1 03 88 | f0 0e 0b 21 88 f0 0e 5c |...!....|...!...\|
|000025f0| 6e 21 88 f0 0e 09 21 88 | f1 0e 08 60 0e 0d 23 88 |n!....!.|...`..#.|
|00002600| aa 04 f2 c4 21 88 0e 07 | 62 88 0e 11 29 aa 89 0e |....!...|b...)...|
|00002610| 33 f4 3d ae 83 f5 f6 21 | 2e 0e 87 22 20 5b 65 64 |3.=....!|..." [ed|
|00002620| 69 66 66 2d 67 65 74 2d | 67 72 6f 75 70 2d 62 75 |iff-get-|group-bu|
|00002630| 66 66 65 72 20 6d 65 74 | 61 2d 6c 69 73 74 20 74 |ffer met|a-list t|
|00002640| 20 30 20 6e 69 6c 20 62 | 75 66 66 65 72 2d 72 65 | 0 nil b|uffer-re|
|00002650| 61 64 2d 6f 6e 6c 79 20 | 74 6d 70 2d 6c 69 73 74 |ad-only |tmp-list|
|00002660| 20 70 6f 69 6e 74 20 70 | 74 20 66 33 20 66 32 20 | point p|t f3 f2 |
|00002670| 66 31 20 73 65 73 73 69 | 6f 6e 2d 62 75 66 20 65 |f1 sessi|on-buf e|
|00002680| 6c 74 20 72 65 67 65 78 | 70 20 73 65 73 73 69 6f |lt regex|p sessio|
|00002690| 6e 4e 75 6d 20 65 6d 70 | 74 79 20 6d 65 74 61 2d |nNum emp|ty meta-|
|000026a0| 62 75 66 20 53 74 61 72 | 74 42 75 66 66 65 72 20 |buf Star|tBuffer |
|000026b0| 67 65 74 2d 62 75 66 66 | 65 72 20 62 75 66 66 65 |get-buff|er buffe|
|000026c0| 72 2d 6e 61 6d 65 20 28 | 28 73 65 74 2d 62 75 66 |r-name (|(set-buf|
|000026d0| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|000026e0| 29 20 65 72 61 73 65 2d | 62 75 66 66 65 72 20 66 |) erase-|buffer f|
|000026f0| 6f 72 6d 61 74 20 65 64 | 69 66 66 2d 6d 65 74 61 |ormat ed|iff-meta|
|00002700| 2d 62 75 66 66 65 72 2d | 6d 65 73 73 61 67 65 20 |-buffer-|message |
|00002710| 65 64 69 66 66 2d 61 62 | 62 72 65 76 2d 6a 6f 62 |ediff-ab|brev-job|
|00002720| 6e 61 6d 65 20 65 64 69 | 66 66 2d 6d 65 74 61 6a |name edi|ff-metaj|
|00002730| 6f 62 2d 6e 61 6d 65 20 | 65 64 69 66 66 2d 67 65 |ob-name |ediff-ge|
|00002740| 74 2d 67 72 6f 75 70 2d | 72 65 67 65 78 70 20 6d |t-group-|regexp m|
|00002750| 65 74 61 6a 6f 62 20 65 | 64 69 66 66 2d 72 65 76 |etajob e|diff-rev|
|00002760| 69 73 69 6f 6e 2d 6d 65 | 74 61 6a 6f 62 20 28 65 |ision-me|tajob (e|
|00002770| 64 69 66 66 2d 64 69 72 | 65 63 74 6f 72 69 65 73 |diff-dir|ectories|
|00002780| 20 65 64 69 66 66 2d 64 | 69 72 65 63 74 6f 72 79 | ediff-d|irectory|
|00002790| 2d 72 65 76 69 73 69 6f | 6e 73 29 20 22 20 20 20 |-revisio|ns) " |
|000027a0| 20 20 60 50 27 3a 09 63 | 6f 6c 6c 65 63 74 20 63 | `P':.c|ollect c|
|000027b0| 75 73 74 6f 6d 20 64 69 | 66 66 73 20 6f 66 20 61 |ustom di|ffs of a|
|000027c0| 6c 6c 20 6d 61 72 6b 65 | 64 20 73 65 73 73 69 6f |ll marke|d sessio|
|000027d0| 6e 73 5c 6e 22 20 22 20 | 20 20 20 20 60 75 27 3a |ns\n" " | `u':|
|000027e0| 09 73 68 6f 77 20 70 61 | 72 65 6e 74 20 73 65 73 |.show pa|rent ses|
|000027f0| 73 69 6f 6e 20 67 72 6f | 75 70 5c 6e 20 20 20 20 |sion gro|up\n |
|00002800| 20 60 44 27 3a 09 64 69 | 73 70 6c 61 79 20 64 69 | `D':.di|splay di|
|00002810| 66 66 65 72 65 6e 63 65 | 73 20 61 6d 6f 6e 67 20 |fference|s among |
|00002820| 74 68 65 20 63 6f 6e 74 | 65 6e 74 73 20 6f 66 20 |the cont|ents of |
|00002830| 64 69 72 65 63 74 6f 72 | 69 65 73 5c 6e 5c 6e 22 |director|ies\n\n"|
|00002840| 20 22 46 69 6c 74 65 72 | 2d 74 68 72 6f 75 67 68 | "Filter|-through|
|00002850| 20 72 65 67 75 6c 61 72 | 20 65 78 70 72 65 73 73 | regular| express|
|00002860| 69 6f 6e 3a 20 25 73 5c | 6e 22 20 22 5c 6e 5c 6e |ion: %s\|n" "\n\n|
|00002870| 20 20 20 20 20 20 20 20 | 53 69 7a 65 20 20 4e 61 | |Size Na|
|00002880| 6d 65 5c 6e 20 20 20 20 | 2d 2d 2d 2d 2d 2d 2d 2d |me\n |--------|
|00002890| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|000028a0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|000028b0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|000028c0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 5c |--------|-------\|
|000028d0| 6e 5c 6e 22 20 65 64 69 | 66 66 2d 67 65 74 2d 73 |n\n" edi|ff-get-s|
|000028e0| 65 73 73 69 6f 6e 2d 73 | 74 61 74 75 73 20 37 33 |ession-s|tatus 73|
|000028f0| 20 22 20 20 20 20 20 2a | 2a 2a 2a 2a 2a 20 20 20 | " *|***** |
|00002900| 2a 2a 2a 2a 2a 2a 20 20 | 20 54 68 69 73 20 73 65 |****** | This se|
|00002910| 73 73 69 6f 6e 20 67 72 | 6f 75 70 20 68 61 73 20 |ssion gr|oup has |
|00002920| 6e 6f 20 6d 65 6d 62 65 | 72 73 5c 6e 22 20 65 64 |no membe|rs\n" ed|
|00002930| 69 66 66 2d 67 65 74 2d | 73 65 73 73 69 6f 6e 2d |iff-get-|session-|
|00002940| 62 75 66 66 65 72 20 65 | 64 69 66 66 2d 67 65 74 |buffer e|diff-get|
|00002950| 2d 73 65 73 73 69 6f 6e | 2d 6f 62 6a 41 20 65 64 |-session|-objA ed|
|00002960| 69 66 66 2d 67 65 74 2d | 73 65 73 73 69 6f 6e 2d |iff-get-|session-|
|00002970| 6f 62 6a 42 20 65 64 69 | 66 66 2d 67 65 74 2d 73 |objB edi|ff-get-s|
|00002980| 65 73 73 69 6f 6e 2d 6f | 62 6a 43 20 22 20 22 20 |ession-o|bjC " " |
|00002990| 22 2b 22 20 22 2d 22 20 | 22 20 20 53 65 73 73 69 |"+" "-" |" Sessi|
|000029a0| 6f 6e 20 22 20 69 6e 74 | 2d 74 6f 2d 73 74 72 69 |on " int|-to-stri|
|000029b0| 6e 67 20 22 3a 5c 6e 22 | 20 65 64 69 66 66 2d 6d |ng ":\n"| ediff-m|
|000029c0| 65 74 61 2d 69 6e 73 65 | 72 74 2d 66 69 6c 65 2d |eta-inse|rt-file-|
|000029d0| 69 6e 66 6f 20 65 64 69 | 66 66 2d 73 65 74 2d 6d |info edi|ff-set-m|
|000029e0| 65 74 61 2d 6f 76 65 72 | 6c 61 79 20 73 65 74 2d |eta-over|lay set-|
|000029f0| 62 75 66 66 65 72 2d 6d | 6f 64 69 66 69 65 64 2d |buffer-m|odified-|
|00002a00| 70 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |p this-c|ommand e|
|00002a10| 64 69 66 66 2d 71 75 69 | 74 20 65 72 72 6f 72 20 |diff-qui|t error |
|00002a20| 22 59 6f 75 27 76 65 20 | 6b 69 6c 6c 65 64 20 61 |"You've |killed a|
|00002a30| 6e 20 65 73 73 65 6e 74 | 69 61 6c 20 45 64 69 66 |n essent|ial Edif|
|00002a40| 66 20 62 75 66 66 65 72 | 2d 2d 2d 50 6c 65 61 73 |f buffer|---Pleas|
|00002a50| 65 20 71 75 69 74 20 45 | 64 69 66 66 22 5d 20 31 |e quit E|diff"] 1|
|00002a60| 34 5d 20 65 64 69 66 66 | 2d 70 72 6f 62 6c 65 6d |4] ediff|-problem|
|00002a70| 61 74 69 63 2d 73 65 73 | 73 69 6f 6e 2d 70 20 23 |atic-ses|sion-p #|
|00002a80| 5b 28 73 65 73 73 69 6f | 6e 29 20 22 c0 09 21 c2 |[(sessio|n) "..!.|
|00002a90| 09 21 c3 09 21 1c 1d 89 | 1e 06 3b ab a5 c7 0e 06 |.!..!...|..;.....|
|00002aa0| 21 ac 9f 0d 3b ab 9b c7 | 0d 21 ac 96 0c 3b ab 92 |!...;...|.!...;..|
|00002ab0| c7 0c 21 ab 8d c8 1e 09 | 0e 5c 6e cb 3e 29 ab 83 |..!.....|.\n.>)..|
|00002ac0| cc aa 81 c8 2b 87 22 20 | 5b 65 64 69 66 66 2d 67 |....+." |[ediff-g|
|00002ad0| 65 74 2d 73 65 73 73 69 | 6f 6e 2d 6f 62 6a 41 20 |et-sessi|on-objA |
|00002ae0| 73 65 73 73 69 6f 6e 20 | 65 64 69 66 66 2d 67 65 |session |ediff-ge|
|00002af0| 74 2d 73 65 73 73 69 6f | 6e 2d 6f 62 6a 42 20 65 |t-sessio|n-objB e|
|00002b00| 64 69 66 66 2d 67 65 74 | 2d 73 65 73 73 69 6f 6e |diff-get|-session|
|00002b10| 2d 6f 62 6a 43 20 66 33 | 20 66 32 20 66 31 20 66 |-objC f3| f2 f1 f|
|00002b20| 69 6c 65 2d 64 69 72 65 | 63 74 6f 72 79 2d 70 20 |ile-dire|ctory-p |
|00002b30| 6e 69 6c 20 6d 65 74 61 | 6a 6f 62 20 65 64 69 66 |nil meta|job edif|
|00002b40| 66 2d 6d 65 74 61 6a 6f | 62 2d 6e 61 6d 65 20 28 |f-metajo|b-name (|
|00002b50| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 64 69 72 65 |ediff-me|rge-dire|
|00002b60| 63 74 6f 72 69 65 73 2d | 77 69 74 68 2d 61 6e 63 |ctories-|with-anc|
|00002b70| 65 73 74 6f 72 20 65 64 | 69 66 66 2d 6d 65 72 67 |estor ed|iff-merg|
|00002b80| 65 2d 66 69 6c 65 67 72 | 6f 75 70 73 2d 77 69 74 |e-filegr|oups-wit|
|00002b90| 68 2d 61 6e 63 65 73 74 | 6f 72 29 20 61 6e 63 65 |h-ancest|or) ance|
|00002ba0| 73 74 6f 72 2d 69 73 2d | 64 69 72 5d 20 35 5d 20 |stor-is-|dir] 5] |
|00002bb0| 65 64 69 66 66 2d 6d 65 | 74 61 2d 69 6e 73 65 72 |ediff-me|ta-inser|
|00002bc0| 74 2d 66 69 6c 65 2d 69 | 6e 66 6f 20 23 5b 28 66 |t-file-i|nfo #[(f|
|00002bd0| 69 6c 65 29 20 22 08 3b | ad dc c1 c2 c3 c4 08 21 |ile) ".;|.......!|
|00002be0| 38 c5 08 21 ab a9 c6 08 | c7 1e 08 18 0e 08 3b ab |8..!....|......;.|
|00002bf0| 8d 0e 08 c9 42 43 1e 5c | 6e cb 08 21 29 aa 8d 0e |....BC.\|n..!)...|
|00002c00| 0c ab 85 cb 08 21 aa 84 | cb 08 cd 5c 22 2a 21 aa |.....!..|...\"*!.|
|00002c10| a5 08 c7 1e 08 18 0e 08 | 3b ab 8d 0e 08 c9 42 43 |........|;.....BC|
|00002c20| 1e 5c 6e cb 08 21 29 aa | 8d 0e 0c ab 85 cb 08 21 |.\n..!).|.......!|
|00002c30| aa 84 cb 08 cd 5c 22 2a | 23 63 87 22 20 5b 66 69 |.....\"*|#c." [fi|
|00002c40| 6c 65 20 66 6f 72 6d 61 | 74 20 22 20 20 25 31 30 |le forma|t " %10|
|00002c50| 64 20 20 25 73 5c 6e 22 | 20 37 20 66 69 6c 65 2d |d %s\n"| 7 file-|
|00002c60| 61 74 74 72 69 62 75 74 | 65 73 20 66 69 6c 65 2d |attribut|es file-|
|00002c70| 64 69 72 65 63 74 6f 72 | 79 2d 70 20 66 69 6c 65 |director|y-p file|
|00002c80| 2d 6e 61 6d 65 2d 61 73 | 2d 64 69 72 65 63 74 6f |-name-as|-directo|
|00002c90| 72 79 20 6e 69 6c 20 64 | 69 72 20 22 22 20 64 69 |ry nil d|ir "" di|
|00002ca0| 72 65 63 74 6f 72 79 2d | 61 62 62 72 65 76 2d 61 |rectory-|abbrev-a|
|00002cb0| 6c 69 73 74 20 61 62 62 | 72 65 76 69 61 74 65 2d |list abb|reviate-|
|00002cc0| 66 69 6c 65 2d 6e 61 6d | 65 20 65 64 69 66 66 2d |file-nam|e ediff-|
|00002cd0| 65 6d 61 63 73 2d 70 20 | 74 5d 20 37 5d 20 65 64 |emacs-p |t] 7] ed|
|00002ce0| 69 66 66 2d 64 72 61 77 | 2d 64 69 72 2d 64 69 66 |iff-draw|-dir-dif|
|00002cf0| 66 73 20 23 5b 28 64 69 | 66 66 2d 6c 69 73 74 29 |fs #[(di|ff-list)|
|00002d00| 20 22 08 ac 84 c1 c2 21 | 88 c3 c4 c5 5c 22 1e 06 | ".....!|....\"..|
|00002d10| c7 08 21 1e 08 c9 08 21 | ca 1e 0b 1e 0c 0e 0b 3b |..!....!|.......;|
|00002d20| ab 8e 0e 0b cd 42 43 1e | 0e cf 0e 0c 21 29 aa 8f |.....BC.|....!)..|
|00002d30| 0e 10 ab 86 cf 0e 0c 21 | aa 85 cf 0e 0c d1 5c 22 |.......!|......\"|
|00002d40| 2a 1e 12 d3 08 21 ca 1e | 0b 1e 0c 0e 0b 3b ab 8e |*....!..|.....;..|
|00002d50| 0e 0b cd 42 43 1e 0e cf | 0e 0c 21 29 aa 8f 0e 10 |...BC...|..!)....|
|00002d60| ab 86 cf 0e 0c 21 aa 85 | cf 0e 0c d1 5c 22 2a 1e |.....!..|....\"*.|
|00002d70| 14 d5 08 21 89 1e 16 3b | ad aa 0e 16 ca 1e 0b 1e |...!...;|........|
|00002d80| 0c 0e 0b 3b ab 8e 0e 0b | cd 42 43 1e 0e cf 0e 0c |...;....|.BC.....|
|00002d90| 21 29 aa 8f 0e 10 ab 86 | cf 0e 0c 21 aa 85 cf 0e |!)......|...!....|
|00002da0| 0c d1 5c 22 2a 1e 16 d7 | 08 21 1e 18 d9 da db 5c |..\"*...|.!.....\|
|00002db0| 22 1e 1c ca 1e 0c ca 1e | 1d ca 1e 1e 08 41 10 df |".......|.....A..|
|00002dc0| 0e 06 21 16 20 70 1e 21 | 0e 20 83 e6 02 e2 0e 20 |..!. p.!|. ..... |
|00002dd0| 21 83 e6 02 e3 e2 0e 20 | 21 21 83 e6 02 e4 8e 0e |!...... |!!......|
|00002de0| 20 71 88 e5 0e 26 21 88 | e7 20 88 0e 18 16 28 e9 | q...&!.|. ....(.|
|00002df0| 63 88 ea 63 88 0e 08 3b | ab 8e 0e 08 47 eb 56 ab |c..c...;|....G.V.|
|00002e00| 87 ec ed 0e 08 5c 22 63 | 88 ee 63 88 ec ef f0 f1 |.....\"c|..c.....|
|00002e10| 0e 12 21 ca 1e 0b 1e 0c | 0e 0b 3b ab 8e 0e 0b cd |..!.....|..;.....|
|00002e20| 42 43 1e 0e cf 0e 0c 21 | 29 aa 8f 0e 10 ab 86 cf |BC.....!|).......|
|00002e30| 0e 0c 21 aa 85 cf 0e 0c | d1 5c 22 2a f2 5c 22 f0 |..!.....|.\"*.\".|
|00002e40| f1 0e 14 21 ca 1e 0b 1e | 0c 0e 0b 3b ab 8e 0e 0b |...!....|...;....|
|00002e50| cd 42 43 1e 0e cf 0e 0c | 21 29 aa 8f 0e 10 ab 86 |.BC.....|!)......|
|00002e60| cf 0e 0c 21 aa 85 cf 0e | 0c d1 5c 22 2a f2 5c 22 |...!....|..\"*.\"|
|00002e70| 23 63 88 0e 16 ab b6 ec | f3 f0 f1 0e 16 21 ca 1e |#c......|.....!..|
|00002e80| 0b 1e 0c 0e 0b 3b ab 8e | 0e 0b cd 42 43 1e 0e cf |.....;..|...BC...|
|00002e90| 0e 0c 21 29 aa 8f 0e 10 | ab 86 cf 0e 0c 21 aa 85 |..!)....|.....!..|
|00002ea0| cf 0e 0c d1 5c 22 2a f2 | 5c 22 5c 22 63 88 aa 83 |....\"*.|\"\"c...|
|00002eb0| ee 63 88 ec f4 0e 1c 89 | 23 63 88 0e 16 3b ab 89 |.c......|#c...;..|
|00002ec0| ec f5 0e 1c 5c 22 63 88 | aa 83 f6 63 88 08 ac 83 |....\"c.|...c....|
|00002ed0| f7 63 88 08 83 db 02 08 | 40 40 16 0c 08 40 41 16 |.c......|@@...@A.|
|00002ee0| 1d 08 41 10 f8 0e 1d f9 | 5c 22 eb 55 ab c3 ec fa |..A.....|\".U....|
|00002ef0| f0 fb 0e 12 0e 0c 50 21 | ab 86 f1 0e 0c 21 aa 82 |......P!|.....!..|
|00002f00| 0e 0c ca 1e 0b 1e 0c 0e | 0b 3b ab 8e 0e 0b cd 42 |........|.;.....B|
|00002f10| 43 1e 0e cf 0e 0c 21 29 | aa 8f 0e 10 ab 86 cf 0e |C.....!)|........|
|00002f20| 0c 21 aa 85 cf 0e 0c d1 | 5c 22 2a fc 5c 22 5c 22 |.!......|\"*.\"\"|
|00002f30| 63 88 aa 86 ec fa fd 5c | 22 63 88 f8 0e 1d fe 5c |c......\|"c.....\|
|00002f40| 22 eb 55 ab c3 ec ff f0 | fb 0e 14 0e 0c 50 21 ab |".U.....|.....P!.|
|00002f50| 86 f1 0e 0c 21 aa 82 0e | 0c ca 1e 0b 1e 0c 0e 0b |....!...|........|
|00002f60| 3b ab 8e 0e 0b cd 42 43 | 1e 0e cf 0e 0c 21 29 aa |;.....BC|.....!).|
|00002f70| 8f 0e 10 ab 86 cf 0e 0c | 21 aa 85 cf 0e 0c d1 5c |........|!......\|
|00002f80| 22 2a fc 5c 22 5c 22 63 | 88 aa 86 ec ff fd 5c 22 |"*.\"\"c|......\"|
|00002f90| 63 88 0e 16 3b ab d8 f8 | 0e 1d 81 40 00 5c 22 eb |c...;...|...@.\".|
|00002fa0| 55 ab c5 ec 81 41 00 f0 | fb 0e 16 0e 0c 50 21 ab |U....A..|.....P!.|
|00002fb0| 86 f1 0e 0c 21 aa 82 0e | 0c ca 1e 0b 1e 0c 0e 0b |....!...|........|
|00002fc0| 3b ab 8e 0e 0b cd 42 43 | 1e 0e cf 0e 0c 21 29 aa |;.....BC|.....!).|
|00002fd0| 8f 0e 10 ab 86 cf 0e 0c | 21 aa 85 cf 0e 0c d1 5c |........|!......\|
|00002fe0| 22 2a fc 5c 22 5c 22 63 | 88 aa 88 ec 81 41 00 fd |"*.\"\"c|.....A..|
|00002ff0| 5c 22 63 88 ee 63 88 82 | c3 01 d1 16 1e 81 42 00 |\"c..c..|......B.|
|00003000| ca 21 29 aa 8d 0e 43 81 | 44 00 3d ae 85 c1 81 45 |.!)...C.|D.=....E|
|00003010| 00 21 2e 0c 87 22 20 5b | 64 69 66 66 2d 6c 69 73 |.!..." [|diff-lis|
|00003020| 74 20 65 72 72 6f 72 20 | 22 4c 6f 73 74 20 64 69 |t error |"Lost di|
|00003030| 66 66 65 72 65 6e 63 65 | 20 69 6e 66 6f 20 6f 6e |fference| info on|
|00003040| 20 74 68 65 73 65 20 64 | 69 72 65 63 74 6f 72 69 | these d|irectori|
|00003050| 65 73 22 20 65 64 69 66 | 66 2d 75 6e 69 71 75 65 |es" edif|f-unique|
|00003060| 2d 62 75 66 66 65 72 2d | 6e 61 6d 65 20 22 2a 45 |-buffer-|name "*E|
|00003070| 64 69 66 66 20 46 69 6c | 65 20 47 72 6f 75 70 20 |diff Fil|e Group |
|00003080| 44 69 66 66 65 72 65 6e | 63 65 73 22 20 22 2a 22 |Differen|ces" "*"|
|00003090| 20 62 75 66 2d 6e 61 6d | 65 20 65 64 69 66 66 2d | buf-nam|e ediff-|
|000030a0| 67 65 74 2d 67 72 6f 75 | 70 2d 72 65 67 65 78 70 |get-grou|p-regexp|
|000030b0| 20 72 65 67 65 78 70 20 | 65 64 69 66 66 2d 67 65 | regexp |ediff-ge|
|000030c0| 74 2d 67 72 6f 75 70 2d | 6f 62 6a 41 20 6e 69 6c |t-group-|objA nil|
|000030d0| 20 64 69 72 20 66 69 6c | 65 20 22 22 20 64 69 72 | dir fil|e "" dir|
|000030e0| 65 63 74 6f 72 79 2d 61 | 62 62 72 65 76 2d 61 6c |ectory-a|bbrev-al|
|000030f0| 69 73 74 20 61 62 62 72 | 65 76 69 61 74 65 2d 66 |ist abbr|eviate-f|
|00003100| 69 6c 65 2d 6e 61 6d 65 | 20 65 64 69 66 66 2d 65 |ile-name| ediff-e|
|00003110| 6d 61 63 73 2d 70 20 74 | 20 64 69 72 31 20 65 64 |macs-p t| dir1 ed|
|00003120| 69 66 66 2d 67 65 74 2d | 67 72 6f 75 70 2d 6f 62 |iff-get-|group-ob|
|00003130| 6a 42 20 64 69 72 32 20 | 65 64 69 66 66 2d 67 65 |jB dir2 |ediff-ge|
|00003140| 74 2d 67 72 6f 75 70 2d | 6f 62 6a 43 20 64 69 72 |t-group-|objC dir|
|00003150| 33 20 65 64 69 66 66 2d | 67 65 74 2d 67 72 6f 75 |3 ediff-|get-grou|
|00003160| 70 2d 62 75 66 66 65 72 | 20 6d 65 74 61 2d 62 75 |p-buffer| meta-bu|
|00003170| 66 20 6d 61 6b 65 2d 73 | 74 72 69 6e 67 20 32 36 |f make-s|tring 26|
|00003180| 20 34 35 20 75 6e 64 65 | 72 6c 69 6e 65 20 63 6f | 45 unde|rline co|
|00003190| 64 65 20 62 75 66 66 65 | 72 2d 72 65 61 64 2d 6f |de buffe|r-read-o|
|000031a0| 6e 6c 79 20 67 65 74 2d | 62 75 66 66 65 72 2d 63 |nly get-|buffer-c|
|000031b0| 72 65 61 74 65 20 65 64 | 69 66 66 2d 64 69 72 2d |reate ed|iff-dir-|
|000031c0| 64 69 66 66 73 2d 62 75 | 66 66 65 72 20 53 74 61 |diffs-bu|ffer Sta|
|000031d0| 72 74 42 75 66 66 65 72 | 20 67 65 74 2d 62 75 66 |rtBuffer| get-buf|
|000031e0| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |fer buff|er-name |
|000031f0| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00003200| 72 74 42 75 66 66 65 72 | 29 29 20 75 73 65 2d 6c |rtBuffer|)) use-l|
|00003210| 6f 63 61 6c 2d 6d 61 70 | 20 65 64 69 66 66 2d 64 |ocal-map| ediff-d|
|00003220| 69 72 2d 64 69 66 66 73 | 2d 62 75 66 66 65 72 2d |ir-diffs|-buffer-|
|00003230| 6d 61 70 20 65 72 61 73 | 65 2d 62 75 66 66 65 72 |map eras|e-buffer|
|00003240| 20 65 64 69 66 66 2d 6d | 65 74 61 2d 62 75 66 66 | ediff-m|eta-buff|
|00003250| 65 72 20 22 09 09 2a 2a | 2a 20 44 69 72 65 63 74 |er "..**|* Direct|
|00003260| 6f 72 79 20 44 69 66 66 | 65 72 65 6e 63 65 73 20 |ory Diff|erences |
|00003270| 2a 2a 2a 5c 6e 22 20 22 | 5c 6e 55 73 65 66 75 6c |***\n" "|\nUseful|
|00003280| 20 63 6f 6d 6d 61 6e 64 | 73 3a 5c 6e 20 20 20 20 | command|s:\n |
|00003290| 20 60 71 27 3a 20 68 69 | 64 65 20 74 68 69 73 20 | `q': hi|de this |
|000032a0| 62 75 66 66 65 72 5c 6e | 20 20 20 20 20 53 50 43 |buffer\n| SPC|
|000032b0| 3a 20 6e 65 78 74 20 6c | 69 6e 65 5c 6e 20 20 20 |: next l|ine\n |
|000032c0| 20 20 44 45 4c 3a 20 70 | 72 65 76 69 6f 75 73 20 | DEL: p|revious |
|000032d0| 6c 69 6e 65 5c 6e 5c 6e | 22 20 30 20 66 6f 72 6d |line\n\n|" 0 form|
|000032e0| 61 74 20 22 46 69 6c 74 | 65 72 2d 74 68 72 6f 75 |at "Filt|er-throu|
|000032f0| 67 68 20 72 65 67 75 6c | 61 72 20 65 78 70 72 65 |gh regul|ar expre|
|00003300| 73 73 69 6f 6e 3a 20 25 | 73 5c 6e 22 20 22 5c 6e |ssion: %|s\n" "\n|
|00003310| 22 20 22 5c 6e 25 2d 32 | 37 73 25 2d 32 36 73 22 |" "\n%-2|7s%-26s"|
|00003320| 20 65 64 69 66 66 2d 74 | 72 75 6e 63 61 74 65 2d | ediff-t|runcate-|
|00003330| 73 74 72 69 6e 67 2d 6c | 65 66 74 20 66 69 6c 65 |string-l|eft file|
|00003340| 2d 6e 61 6d 65 2d 61 73 | 2d 64 69 72 65 63 74 6f |-name-as|-directo|
|00003350| 72 79 20 32 35 20 22 20 | 25 2d 32 35 73 5c 6e 22 |ry 25 " |%-25s\n"|
|00003360| 20 22 25 73 25 73 22 20 | 22 25 73 5c 6e 5c 6e 22 | "%s%s" |"%s\n\n"|
|00003370| 20 22 5c 6e 5c 6e 22 20 | 22 5c 6e 09 2a 2a 2a 20 | "\n\n" |"\n.*** |
|00003380| 20 4e 6f 20 64 69 66 66 | 65 72 65 6e 63 65 73 20 | No diff|erences |
|00003390| 20 2a 2a 2a 5c 6e 22 20 | 6d 6f 64 20 32 20 22 25 | ***\n" |mod 2 "%|
|000033a0| 2d 32 37 73 22 20 66 69 | 6c 65 2d 64 69 72 65 63 |-27s" fi|le-direc|
|000033b0| 74 6f 72 79 2d 70 20 32 | 34 20 22 2d 2d 2d 22 20 |tory-p 2|4 "---" |
|000033c0| 33 20 22 25 2d 32 36 73 | 22 20 35 20 22 20 25 2d |3 "%-26s|" 5 " %-|
|000033d0| 32 35 73 22 20 73 65 74 | 2d 62 75 66 66 65 72 2d |25s" set|-buffer-|
|000033e0| 6d 6f 64 69 66 69 65 64 | 2d 70 20 74 68 69 73 2d |modified|-p this-|
|000033f0| 63 6f 6d 6d 61 6e 64 20 | 65 64 69 66 66 2d 71 75 |command |ediff-qu|
|00003400| 69 74 20 22 59 6f 75 27 | 76 65 20 6b 69 6c 6c 65 |it "You'|ve kille|
|00003410| 64 20 61 6e 20 65 73 73 | 65 6e 74 69 61 6c 20 45 |d an ess|ential E|
|00003420| 64 69 66 66 20 62 75 66 | 66 65 72 2d 2d 2d 50 6c |diff buf|fer---Pl|
|00003430| 65 61 73 65 20 71 75 69 | 74 20 45 64 69 66 66 22 |ease qui|t Ediff"|
|00003440| 5d 20 38 5d 5d 20 32 29 | 0a 28 66 73 65 74 20 27 |] 8]] 2)|.(fset '|
|00003450| 65 64 69 66 66 2d 62 75 | 72 79 2d 64 69 72 2d 64 |ediff-bu|ry-dir-d|
|00003460| 69 66 66 73 2d 62 75 66 | 66 65 72 20 23 5b 6e 69 |iffs-buf|fer #[ni|
|00003470| 6c 20 22 08 c1 1a 1b c4 | 20 88 c5 0b 21 89 12 ab |l ".....| ...!...|
|00003480| 85 c6 5c 6e 21 aa 85 c7 | c8 20 0b 5c 22 2a 87 22 |..\n!...|. .\"*."|
|00003490| 20 5b 65 64 69 66 66 2d | 6d 65 74 61 2d 62 75 66 | [ediff-|meta-buf|
|000034a0| 66 65 72 20 6e 69 6c 20 | 77 69 6e 64 20 62 75 66 |fer nil |wind buf|
|000034b0| 20 62 75 72 79 2d 62 75 | 66 66 65 72 20 65 64 69 | bury-bu|ffer edi|
|000034c0| 66 66 2d 67 65 74 2d 76 | 69 73 69 62 6c 65 2d 62 |ff-get-v|isible-b|
|000034d0| 75 66 66 65 72 2d 77 69 | 6e 64 6f 77 20 73 65 6c |uffer-wi|ndow sel|
|000034e0| 65 63 74 2d 77 69 6e 64 | 6f 77 20 73 65 74 2d 77 |ect-wind|ow set-w|
|000034f0| 69 6e 64 6f 77 2d 62 75 | 66 66 65 72 20 73 65 6c |indow-bu|ffer sel|
|00003500| 65 63 74 65 64 2d 77 69 | 6e 64 6f 77 5d 20 33 20 |ected-wi|ndow] 3 |
|00003510| 22 5c 0a 42 75 72 79 20 | 74 68 65 20 64 69 72 65 |"\.Bury |the dire|
|00003520| 63 74 6f 72 79 20 64 69 | 66 66 65 72 65 6e 63 65 |ctory di|fference|
|00003530| 20 62 75 66 66 65 72 2e | 20 44 69 73 70 6c 61 79 | buffer.| Display|
|00003540| 20 74 68 65 20 6d 65 74 | 61 20 62 75 66 66 65 72 | the met|a buffer|
|00003550| 20 69 6e 73 74 65 61 64 | 2e 22 20 6e 69 6c 5d 29 | instead|." nil])|
|00003560| 0a 28 66 73 65 74 20 27 | 65 64 69 66 66 2d 73 68 |.(fset '|ediff-sh|
|00003570| 6f 77 2d 64 69 72 2d 64 | 69 66 66 73 20 23 5b 6e |ow-dir-d|iffs #[n|
|00003580| 69 6c 20 22 c0 19 c2 09 | 21 29 ab 84 c3 c4 21 88 |il "....|!)....!.|
|00003590| 0d ab 8c c6 0d 21 ab 87 | c7 c6 0d 21 21 ac 85 c8 |.....!..|...!!...|
|000035a0| 0e 09 21 88 0d 1e 5c 6e | cb cc 21 88 cd ce 20 0e |..!...\n|..!... .|
|000035b0| 5c 6e 5c 22 88 65 62 29 | 87 22 20 5b 6e 69 6c 20 |\n\".eb)|." [nil |
|000035c0| 6d 65 74 61 6a 6f 62 20 | 65 64 69 66 66 2d 72 65 |metajob |ediff-re|
|000035d0| 76 69 73 69 6f 6e 2d 6d | 65 74 61 6a 6f 62 20 65 |vision-m|etajob e|
|000035e0| 72 72 6f 72 20 22 54 68 | 69 73 20 63 6f 6d 6d 61 |rror "Th|is comma|
|000035f0| 6e 64 20 69 73 20 69 6e | 61 70 70 6c 69 63 61 62 |nd is in|applicab|
|00003600| 6c 65 20 69 6e 20 74 68 | 65 20 70 72 65 73 65 6e |le in th|e presen|
|00003610| 74 20 63 6f 6e 74 65 78 | 74 22 20 65 64 69 66 66 |t contex|t" ediff|
|00003620| 2d 64 69 72 2d 64 69 66 | 66 73 2d 62 75 66 66 65 |-dir-dif|fs-buffe|
|00003630| 72 20 67 65 74 2d 62 75 | 66 66 65 72 20 62 75 66 |r get-bu|ffer buf|
|00003640| 66 65 72 2d 6e 61 6d 65 | 20 65 64 69 66 66 2d 64 |fer-name| ediff-d|
|00003650| 72 61 77 2d 64 69 72 2d | 64 69 66 66 73 20 65 64 |raw-dir-|diffs ed|
|00003660| 69 66 66 2d 64 69 72 2d | 64 69 66 66 65 72 65 6e |iff-dir-|differen|
|00003670| 63 65 2d 6c 69 73 74 20 | 62 75 66 20 6f 74 68 65 |ce-list |buf othe|
|00003680| 72 2d 77 69 6e 64 6f 77 | 20 31 20 73 65 74 2d 77 |r-window| 1 set-w|
|00003690| 69 6e 64 6f 77 2d 62 75 | 66 66 65 72 20 73 65 6c |indow-bu|ffer sel|
|000036a0| 65 63 74 65 64 2d 77 69 | 6e 64 6f 77 5d 20 33 20 |ected-wi|ndow] 3 |
|000036b0| 22 5c 0a 44 69 73 70 6c | 61 79 20 64 69 66 66 65 |"\.Displ|ay diffe|
|000036c0| 72 65 6e 63 65 73 20 61 | 6d 6f 6e 67 20 74 68 65 |rences a|mong the|
|000036d0| 20 64 69 72 65 63 74 6f | 72 69 65 73 20 69 6e 76 | directo|ries inv|
|000036e0| 6f 6c 76 65 64 20 69 6e | 20 73 65 73 73 69 6f 6e |olved in| session|
|000036f0| 20 67 72 6f 75 70 2e 22 | 20 6e 69 6c 5d 29 0a 28 | group."| nil]).(|
|00003700| 66 73 65 74 20 27 65 64 | 69 66 66 2d 75 70 2d 6d |fset 'ed|iff-up-m|
|00003710| 65 74 61 2d 68 69 65 72 | 61 72 63 68 79 20 23 5b |eta-hier|archy #[|
|00003720| 6e 69 6c 20 22 08 ab 90 | c1 08 21 ab 8b c2 c1 08 |nil "...|..!.....|
|00003730| 21 21 ab 84 c3 08 21 87 | c4 c5 21 87 22 20 5b 65 |!!....!.|..!." [e|
|00003740| 64 69 66 66 2d 70 61 72 | 65 6e 74 2d 6d 65 74 61 |diff-par|ent-meta|
|00003750| 2d 62 75 66 66 65 72 20 | 67 65 74 2d 62 75 66 66 |-buffer |get-buff|
|00003760| 65 72 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 65 |er buffe|r-name e|
|00003770| 64 69 66 66 2d 73 68 6f | 77 2d 6d 65 74 61 2d 62 |diff-sho|w-meta-b|
|00003780| 75 66 66 65 72 20 65 72 | 72 6f 72 20 22 54 68 69 |uffer er|ror "Thi|
|00003790| 73 20 73 65 73 73 69 6f | 6e 20 67 72 6f 75 70 20 |s sessio|n group |
|000037a0| 68 61 73 20 6e 6f 20 70 | 61 72 65 6e 74 22 5d 20 |has no p|arent"] |
|000037b0| 33 20 22 5c 0a 47 6f 20 | 74 6f 20 74 68 65 20 70 |3 "\.Go |to the p|
|000037c0| 61 72 65 6e 74 20 73 65 | 73 73 69 6f 6e 20 67 72 |arent se|ssion gr|
|000037d0| 6f 75 70 20 62 75 66 66 | 65 72 2e 22 20 6e 69 6c |oup buff|er." nil|
|000037e0| 5d 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |]).(byte|-code ".|
|000037f0| c1 4d 88 c2 c3 4d 87 22 | 20 5b 65 64 69 66 66 2d |.M...M."| [ediff-|
|00003800| 72 65 64 72 61 77 2d 72 | 65 67 69 73 74 72 79 2d |redraw-r|egistry-|
|00003810| 62 75 66 66 65 72 20 23 | 5b 28 26 6f 70 74 69 6f |buffer #|[(&optio|
|00003820| 6e 61 6c 20 69 67 6e 6f | 72 65 29 20 22 70 18 09 |nal igno|re) "p..|
|00003830| 83 4d 02 c2 09 21 83 4d | 02 c3 c2 09 21 21 83 4d |.M...!.M|....!!.M|
|00003840| 02 c4 8e 09 71 88 60 c5 | 89 89 89 89 89 89 89 89 |....q.`.|........|
|00003850| 89 89 1e 06 1e 07 1e 08 | 1e 09 1e 5c 6e 1e 0b 1e |........|...\n...|
|00003860| 0c 1e 0d 1e 0e 1e 0f 1e | 10 1e 11 d2 20 88 d3 63 |........|.... ..c|
|00003870| 88 d4 d5 0e 16 5c 22 88 | 0e 16 ac 83 d7 63 88 0e |.....\".|.....c..|
|00003880| 16 16 07 0e 07 83 40 02 | 0e 07 40 16 10 0e 07 41 |......@.|..@....A|
|00003890| 16 07 0e 10 ab 6d c2 0e | 10 21 ab 67 c3 c2 0e 10 |.....m..|.!.g....|
|000038a0| 21 21 ab 5f 70 18 0e 10 | ab a8 c2 0e 10 21 ab a2 |!!._p...|.....!..|
|000038b0| c3 c2 0e 10 21 21 ab 9a | d8 8e 0e 10 71 88 0e 19 |....!!..|....q...|
|000038c0| 16 09 0e 1a 16 08 0e 19 | ad 85 0e 19 db 3d 3f 29 |........|.....=?)|
|000038d0| aa 89 0e 1c dd 3d ae 83 | de df 21 29 83 5a 01 60 |.....=..|..!).Z.`|
|000038e0| 16 5c 6e e0 e1 c3 0e 10 | 21 e2 0e 09 21 23 63 88 |.\n.....|!...!#c.|
|000038f0| e0 e3 e4 0e 08 21 c5 1e | 25 1e 26 0e 25 3b ab 8e |.....!..|%.&.%;..|
|00003900| 0e 25 e7 42 43 1e 28 e9 | 0e 26 21 29 aa 8f 0e 2a |.%.BC.(.|.&!)...*|
|00003910| ab 86 e9 0e 26 21 aa 85 | e9 0e 26 eb 5c 22 2a ec |....&!..|..&.\"*.|
|00003920| 0e 08 21 ae 81 e7 c5 1e | 25 1e 26 0e 25 3b ab 8e |..!.....|%.&.%;..|
|00003930| 0e 25 e7 42 43 1e 28 e9 | 0e 26 21 29 aa 8f 0e 2a |.%.BC.(.|.&!)...*|
|00003940| ab 86 e9 0e 26 21 aa 85 | e9 0e 26 eb 5c 22 2a ed |....&!..|..&.\"*.|
|00003950| 0e 08 21 ae 81 e7 c5 1e | 25 1e 26 0e 25 3b ab 8e |..!.....|%.&.%;..|
|00003960| 0e 25 e7 42 43 1e 28 e9 | 0e 26 21 29 aa 8f 0e 2a |.%.BC.(.|.&!)...*|
|00003970| ab 86 e9 0e 26 21 aa 85 | e9 0e 26 eb 5c 22 2a 24 |....&!..|..&.\"*$|
|00003980| 63 88 ee 0e 5c 6e 60 0e | 10 23 88 82 54 00 70 18 |c...\n`.|.#..T.p.|
|00003990| 0e 10 83 fc 01 c2 0e 10 | 21 83 fc 01 c3 c2 0e 10 |........|!.......|
|000039a0| 21 21 83 fc 01 ef 8e 0e | 10 71 88 0e 30 ab 94 c2 |!!......|.q..0...|
|000039b0| 0e 30 21 ab 8e c3 c2 0e | 30 21 21 ab 86 c3 0e 30 |.0!.....|0!!....0|
|000039c0| 21 aa 81 f1 16 0f 0e 32 | ab 94 c2 0e 32 21 ab 8e |!......2|....2!..|
|000039d0| c3 c2 0e 32 21 21 ab 86 | c3 0e 32 21 aa 81 f1 16 |...2!!..|..2!....|
|000039e0| 0e 0e 33 ac 87 0e 34 ac | 83 e7 aa 99 0e 35 ab 94 |..3...4.|.....5..|
|000039f0| c2 0e 35 21 ab 8e c3 c2 | 0e 35 21 21 ab 86 c3 0e |..5!....|.5!!....|
|00003a00| 35 21 aa 81 f1 16 0d e0 | f6 0e 37 5c 22 16 0b 0e |5!......|..7\"...|
|00003a10| 38 f9 55 ab 83 fa aa 90 | 0e 38 0e 37 55 ab 83 fb |8.U.....|.8.7U...|
|00003a20| aa 86 e0 fc 0e 38 54 5c | 22 16 0c 0e 3d 16 09 29 |.....8T\|"...=..)|
|00003a30| aa 8a 0e 1c dd 3d ac 84 | de df 21 88 29 60 16 5c |.....=..|..!.)`.\|
|00003a40| 6e 0e 0c fe 0e 0b ff c3 | 0e 10 21 e0 81 40 00 e2 |n.......|..!..@..|
|00003a50| 0e 09 21 5c 22 b1 06 88 | 81 41 00 0e 0f 81 42 00 |..!\"...|.A....B.|
|00003a60| 0e 0e 81 42 00 0e 0d 81 | 43 00 b1 07 88 ee 0e 5c |...B....|C......\|
|00003a70| 6e 60 0e 10 23 88 82 54 | 00 81 44 00 c5 21 88 0e |n`..#..T|..D..!..|
|00003a80| 11 62 2e 0d aa 89 0e 1c | dd 3d ae 83 de df 21 29 |.b......|.=....!)|
|00003a90| 87 22 20 5b 53 74 61 72 | 74 42 75 66 66 65 72 20 |." [Star|tBuffer |
|00003aa0| 65 64 69 66 66 2d 72 65 | 67 69 73 74 72 79 2d 62 |ediff-re|gistry-b|
|00003ab0| 75 66 66 65 72 20 67 65 | 74 2d 62 75 66 66 65 72 |uffer ge|t-buffer|
|00003ac0| 20 62 75 66 66 65 72 2d | 6e 61 6d 65 20 28 28 73 | buffer-|name ((s|
|00003ad0| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|00003ae0| 75 66 66 65 72 29 29 20 | 6e 69 6c 20 62 75 66 66 |uffer)) |nil buff|
|00003af0| 65 72 2d 72 65 61 64 2d | 6f 6e 6c 79 20 72 65 67 |er-read-|only reg|
|00003b00| 69 73 74 72 79 2d 6c 69 | 73 74 20 6d 65 74 61 2d |istry-li|st meta-|
|00003b10| 6c 69 73 74 20 6a 6f 62 | 2d 6e 61 6d 65 20 70 74 |list job|-name pt|
|00003b20| 20 74 6f 74 61 6c 2d 64 | 69 66 66 73 20 63 75 72 | total-d|iffs cur|
|00003b30| 2d 64 69 66 66 20 62 75 | 66 43 6e 61 6d 65 20 62 |-diff bu|fCname b|
|00003b40| 75 66 42 6e 61 6d 65 20 | 62 75 66 41 6e 61 6d 65 |ufBname |bufAname|
|00003b50| 20 65 6c 74 20 70 6f 69 | 6e 74 20 65 72 61 73 65 | elt poi|nt erase|
|00003b60| 2d 62 75 66 66 65 72 20 | 22 54 68 69 73 20 69 73 |-buffer |"This is|
|00003b70| 20 61 20 72 65 67 69 73 | 74 72 79 20 6f 66 20 61 | a regis|try of a|
|00003b80| 6c 6c 20 61 63 74 69 76 | 65 20 45 64 69 66 66 20 |ll activ|e Ediff |
|00003b90| 73 65 73 73 69 6f 6e 73 | 2e 5c 6e 5c 6e 55 73 65 |sessions|.\n\nUse|
|00003ba0| 66 75 6c 20 63 6f 6d 6d | 61 6e 64 73 3a 5c 6e 20 |ful comm|ands:\n |
|00003bb0| 20 20 20 20 62 75 74 74 | 6f 6e 32 2c 20 60 76 27 | butt|on2, `v'|
|00003bc0| 2c 20 52 45 54 20 6f 76 | 65 72 20 61 20 73 65 73 |, RET ov|er a ses|
|00003bd0| 73 69 6f 6e 20 72 65 63 | 6f 72 64 3a 20 20 73 77 |sion rec|ord: sw|
|00003be0| 69 74 63 68 20 74 6f 20 | 74 68 61 74 20 73 65 73 |itch to |that ses|
|00003bf0| 73 69 6f 6e 5c 6e 20 20 | 20 20 20 60 4d 27 20 6f |sion\n | `M' o|
|00003c00| 76 65 72 20 61 20 73 65 | 73 73 69 6f 6e 20 72 65 |ver a se|ssion re|
|00003c10| 63 6f 72 64 3a 20 20 64 | 69 73 70 6c 61 79 20 74 |cord: d|isplay t|
|00003c20| 68 65 20 61 73 73 6f 63 | 69 61 74 65 64 20 73 65 |he assoc|iated se|
|00003c30| 73 73 69 6f 6e 20 67 72 | 6f 75 70 5c 6e 20 20 20 |ssion gr|oup\n |
|00003c40| 20 20 60 52 27 20 69 6e | 20 61 6e 79 20 45 64 69 | `R' in| any Edi|
|00003c50| 66 66 20 73 65 73 73 69 | 6f 6e 3a 20 20 20 64 69 |ff sessi|on: di|
|00003c60| 73 70 6c 61 79 20 73 65 | 73 73 69 6f 6e 20 72 65 |splay se|ssion re|
|00003c70| 67 69 73 74 72 79 5c 6e | 20 20 20 20 20 53 50 43 |gistry\n| SPC|
|00003c80| 3a 09 6e 65 78 74 20 73 | 65 73 73 69 6f 6e 5c 6e |:.next s|ession\n|
|00003c90| 20 20 20 20 20 44 45 4c | 3a 09 70 72 65 76 69 6f | DEL|:.previo|
|00003ca0| 75 73 20 73 65 73 73 69 | 6f 6e 5c 6e 20 20 20 20 |us sessi|on\n |
|00003cb0| 20 60 45 27 3a 09 62 72 | 6f 77 73 65 20 45 64 69 | `E':.br|owse Edi|
|00003cc0| 66 66 20 6f 6e 2d 6c 69 | 6e 65 20 6d 61 6e 75 61 |ff on-li|ne manua|
|00003cd0| 6c 5c 6e 20 20 20 20 20 | 60 71 27 3a 09 62 75 72 |l\n |`q':.bur|
|00003ce0| 79 20 72 65 67 69 73 74 | 72 79 5c 6e 5c 6e 5c 6e |y regist|ry\n\n\n|
|00003cf0| 09 09 41 63 74 69 76 65 | 20 45 64 69 66 66 20 53 |..Active| Ediff S|
|00003d00| 65 73 73 69 6f 6e 73 3a | 5c 6e 09 09 2d 2d 2d 2d |essions:|\n..----|
|00003d10| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00003d20| 2d 2d 5c 6e 5c 6e 22 20 | 6d 61 70 63 61 72 20 23 |--\n\n" |mapcar #|
|00003d30| 5b 28 65 6c 74 29 20 22 | 08 ad 8a c1 08 21 ad 85 |[(elt) "|.....!..|
|00003d40| c2 c1 08 21 21 3f ad 86 | c3 08 0c 5c 22 89 14 87 |...!!?..|...\"...|
|00003d50| 22 20 5b 65 6c 74 20 67 | 65 74 2d 62 75 66 66 65 |" [elt g|et-buffe|
|00003d60| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 64 65 |r buffer|-name de|
|00003d70| 6c 71 20 65 64 69 66 66 | 2d 73 65 73 73 69 6f 6e |lq ediff|-session|
|00003d80| 2d 72 65 67 69 73 74 72 | 79 5d 20 33 5d 20 65 64 |-registr|y] 3] ed|
|00003d90| 69 66 66 2d 73 65 73 73 | 69 6f 6e 2d 72 65 67 69 |iff-sess|ion-regi|
|00003da0| 73 74 72 79 20 22 20 20 | 20 20 20 20 20 2a 2a 2a |stry " | ***|
|00003db0| 2a 2a 2a 2a 20 4e 6f 20 | 61 63 74 69 76 65 20 45 |**** No |active E|
|00003dc0| 64 69 66 66 20 73 65 73 | 73 69 6f 6e 73 20 2a 2a |diff ses|sions **|
|00003dd0| 2a 2a 2a 2a 2a 5c 6e 22 | 20 28 28 73 65 74 2d 62 |*****\n"| ((set-b|
|00003de0| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00003df0| 72 29 29 20 65 64 69 66 | 66 2d 6d 65 74 61 6a 6f |r)) edif|f-metajo|
|00003e00| 62 2d 6e 61 6d 65 20 65 | 64 69 66 66 2d 6d 65 74 |b-name e|diff-met|
|00003e10| 61 2d 6c 69 73 74 20 65 | 64 69 66 66 2d 72 65 67 |a-list e|diff-reg|
|00003e20| 69 73 74 72 79 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |istry th|is-comma|
|00003e30| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|00003e40| 72 6f 72 20 22 59 6f 75 | 27 76 65 20 6b 69 6c 6c |ror "You|'ve kill|
|00003e50| 65 64 20 61 6e 20 65 73 | 73 65 6e 74 69 61 6c 20 |ed an es|sential |
|00003e60| 45 64 69 66 66 20 62 75 | 66 66 65 72 2d 2d 2d 50 |Ediff bu|ffer---P|
|00003e70| 6c 65 61 73 65 20 71 75 | 69 74 20 45 64 69 66 66 |lease qu|it Ediff|
|00003e80| 22 20 66 6f 72 6d 61 74 | 20 22 20 20 2a 67 72 6f |" format| " *gro|
|00003e90| 75 70 2a 09 25 73 3a 20 | 25 73 5c 6e 22 20 65 64 |up*.%s: |%s\n" ed|
|00003ea0| 69 66 66 2d 61 62 62 72 | 65 76 2d 6a 6f 62 6e 61 |iff-abbr|ev-jobna|
|00003eb0| 6d 65 20 22 09 09 20 20 | 20 25 73 20 20 20 25 73 |me ".. | %s %s|
|00003ec0| 20 20 20 25 73 5c 6e 22 | 20 65 64 69 66 66 2d 67 | %s\n"| ediff-g|
|00003ed0| 65 74 2d 67 72 6f 75 70 | 2d 6f 62 6a 41 20 64 69 |et-group|-objA di|
|00003ee0| 72 20 66 69 6c 65 20 22 | 22 20 64 69 72 65 63 74 |r file "|" direct|
|00003ef0| 6f 72 79 2d 61 62 62 72 | 65 76 2d 61 6c 69 73 74 |ory-abbr|ev-alist|
|00003f00| 20 61 62 62 72 65 76 69 | 61 74 65 2d 66 69 6c 65 | abbrevi|ate-file|
|00003f10| 2d 6e 61 6d 65 20 65 64 | 69 66 66 2d 65 6d 61 63 |-name ed|iff-emac|
|00003f20| 73 2d 70 20 74 20 65 64 | 69 66 66 2d 67 65 74 2d |s-p t ed|iff-get-|
|00003f30| 67 72 6f 75 70 2d 6f 62 | 6a 42 20 65 64 69 66 66 |group-ob|jB ediff|
|00003f40| 2d 67 65 74 2d 67 72 6f | 75 70 2d 6f 62 6a 43 20 |-get-gro|up-objC |
|00003f50| 65 64 69 66 66 2d 73 65 | 74 2d 6d 65 74 61 2d 6f |ediff-se|t-meta-o|
|00003f60| 76 65 72 6c 61 79 20 28 | 28 73 65 74 2d 62 75 66 |verlay (|(set-buf|
|00003f70| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|00003f80| 29 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 41 |) ediff-|buffer-A|
|00003f90| 20 22 21 21 21 6b 69 6c | 6c 65 64 20 62 75 66 66 | "!!!kil|led buff|
|00003fa0| 65 72 21 21 21 22 20 65 | 64 69 66 66 2d 62 75 66 |er!!!" e|diff-buf|
|00003fb0| 66 65 72 2d 42 20 65 64 | 69 66 66 2d 33 77 61 79 |fer-B ed|iff-3way|
|00003fc0| 2d 63 6f 6d 70 61 72 69 | 73 6f 6e 2d 6a 6f 62 20 |-compari|son-job |
|00003fd0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 6a 6f 62 20 |ediff-me|rge-job |
|00003fe0| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 43 20 22 |ediff-bu|ffer-C "|
|00003ff0| 25 2d 34 64 22 20 65 64 | 69 66 66 2d 6e 75 6d 62 |%-4d" ed|iff-numb|
|00004000| 65 72 2d 6f 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |er-of-di|fference|
|00004010| 73 20 65 64 69 66 66 2d | 63 75 72 72 65 6e 74 2d |s ediff-|current-|
|00004020| 64 69 66 66 65 72 65 6e | 63 65 20 2d 31 20 22 20 |differen|ce -1 " |
|00004030| 20 20 5f 22 20 22 20 20 | 20 24 22 20 22 25 34 64 | _" " | $" "%4d|
|00004040| 22 20 65 64 69 66 66 2d | 6a 6f 62 2d 6e 61 6d 65 |" ediff-|job-name|
|00004050| 20 22 2f 22 20 22 09 22 | 20 22 3a 20 25 73 22 20 | "/" "."| ": %s" |
|00004060| 22 5c 6e 09 09 20 20 20 | 22 20 22 20 20 20 22 20 |"\n.. |" " " |
|00004070| 22 5c 6e 22 20 73 65 74 | 2d 62 75 66 66 65 72 2d |"\n" set|-buffer-|
|00004080| 6d 6f 64 69 66 69 65 64 | 2d 70 5d 20 31 32 5d 20 |modified|-p] 12] |
|00004090| 65 64 69 66 66 2d 73 65 | 74 2d 6d 65 74 61 2d 6f |ediff-se|t-meta-o|
|000040a0| 76 65 72 6c 61 79 20 23 | 5b 28 62 20 65 20 70 72 |verlay #|[(b e pr|
|000040b0| 6f 70 29 20 22 c0 19 c2 | 0b 0c 5c 22 11 0d ab 88 |op) "...|..\"....|
|000040c0| c6 09 c7 c8 23 88 aa 86 | c6 09 c8 c9 23 88 c6 09 |....#...|....#...|
|000040d0| ca 0e 0b 23 29 87 22 20 | 5b 6e 69 6c 20 6f 76 65 |...#)." |[nil ove|
|000040e0| 72 6c 20 65 64 69 66 66 | 2d 6d 61 6b 65 2d 6f 76 |rl ediff|-make-ov|
|000040f0| 65 72 6c 61 79 20 62 20 | 65 20 65 64 69 66 66 2d |erlay b |e ediff-|
|00004100| 65 6d 61 63 73 2d 70 20 | 65 64 69 66 66 2d 6f 76 |emacs-p |ediff-ov|
|00004110| 65 72 6c 61 79 2d 70 75 | 74 20 6d 6f 75 73 65 2d |erlay-pu|t mouse-|
|00004120| 66 61 63 65 20 68 69 67 | 68 6c 69 67 68 74 20 74 |face hig|hlight t|
|00004130| 20 65 64 69 66 66 2d 6d | 65 74 61 2d 69 6e 66 6f | ediff-m|eta-info|
|00004140| 20 70 72 6f 70 5d 20 34 | 5d 5d 20 32 29 0a 28 66 | prop] 4|]] 2).(f|
|00004150| 73 65 74 20 27 65 64 69 | 66 66 2d 6d 61 72 6b 2d |set 'edi|ff-mark-|
|00004160| 66 6f 72 2d 68 69 64 69 | 6e 67 20 23 5b 28 75 6e |for-hidi|ng #[(un|
|00004170| 6d 61 72 6b 29 20 22 c0 | 09 21 1a c3 09 21 1c c5 |mark) ".|.!...!..|
|00004180| 0c 5c 6e 5c 22 1e 06 c7 | 0e 06 21 1e 08 0e 09 ab |.\n\"...|..!.....|
|00004190| 88 ca 0e 06 cb 5c 22 88 | aa a0 0e 08 ab 96 cc 0e |.....\".|........|
|000041a0| 08 21 ab 90 cd cc 0e 08 | 21 21 ab 88 ce cf cd 0e |.!......|!!......|
|000041b0| 08 21 5c 22 88 ca 0e 06 | d0 5c 22 88 d1 0c 21 2c |.!\"....|.\"...!,|
|000041c0| 87 22 20 5b 65 64 69 66 | 66 2d 65 76 65 6e 74 2d |." [edif|f-event-|
|000041d0| 70 6f 69 6e 74 20 6c 61 | 73 74 2d 63 6f 6d 6d 61 |point la|st-comma|
|000041e0| 6e 64 2d 65 76 65 6e 74 | 20 70 6f 73 20 65 64 69 |nd-event| pos edi|
|000041f0| 66 66 2d 65 76 65 6e 74 | 2d 62 75 66 66 65 72 20 |ff-event|-buffer |
|00004200| 6d 65 74 61 2d 62 75 66 | 20 65 64 69 66 66 2d 67 |meta-buf| ediff-g|
|00004210| 65 74 2d 6d 65 74 61 2d | 69 6e 66 6f 20 69 6e 66 |et-meta-|info inf|
|00004220| 6f 20 65 64 69 66 66 2d | 67 65 74 2d 73 65 73 73 |o ediff-|get-sess|
|00004230| 69 6f 6e 2d 62 75 66 66 | 65 72 20 73 65 73 73 69 |ion-buff|er sessi|
|00004240| 6f 6e 2d 62 75 66 20 75 | 6e 6d 61 72 6b 20 65 64 |on-buf u|nmark ed|
|00004250| 69 66 66 2d 73 65 74 2d | 73 65 73 73 69 6f 6e 2d |iff-set-|session-|
|00004260| 73 74 61 74 75 73 20 6e | 69 6c 20 67 65 74 2d 62 |status n|il get-b|
|00004270| 75 66 66 65 72 20 62 75 | 66 66 65 72 2d 6e 61 6d |uffer bu|ffer-nam|
|00004280| 65 20 65 72 72 6f 72 20 | 22 43 61 6e 27 74 20 68 |e error |"Can't h|
|00004290| 69 64 65 20 61 63 74 69 | 76 65 20 73 65 73 73 69 |ide acti|ve sessi|
|000042a0| 6f 6e 2c 20 25 73 22 20 | 37 32 20 65 64 69 66 66 |on, %s" |72 ediff|
|000042b0| 2d 75 70 64 61 74 65 2d | 6d 65 74 61 2d 62 75 66 |-update-|meta-buf|
|000042c0| 66 65 72 5d 20 34 20 22 | 5c 0a 4d 61 72 6b 20 73 |fer] 4 "|\.Mark s|
|000042d0| 65 73 73 69 6f 6e 20 66 | 6f 72 20 68 69 64 69 6e |ession f|or hidin|
|000042e0| 67 2e 20 57 69 74 68 20 | 70 72 65 66 69 78 20 61 |g. With |prefix a|
|000042f0| 72 67 2c 20 75 6e 6d 61 | 72 6b 2e 22 20 22 50 22 |rg, unma|rk." "P"|
|00004300| 5d 29 0a 28 66 73 65 74 | 20 27 65 64 69 66 66 2d |]).(fset| 'ediff-|
|00004310| 6d 61 72 6b 2d 66 6f 72 | 2d 6f 70 65 72 61 74 69 |mark-for|-operati|
|00004320| 6f 6e 20 23 5b 28 75 6e | 6d 61 72 6b 29 20 22 c0 |on #[(un|mark) ".|
|00004330| 09 21 1a c3 09 21 1c c5 | 0c 5c 6e 5c 22 1e 06 0e |.!...!..|.\n\"...|
|00004340| 07 ab 88 c8 0e 06 c9 5c | 22 88 aa 86 c8 0e 06 ca |.......\|".......|
|00004350| 5c 22 88 cb 0c 21 2b 87 | 22 20 5b 65 64 69 66 66 |\"...!+.|" [ediff|
|00004360| 2d 65 76 65 6e 74 2d 70 | 6f 69 6e 74 20 6c 61 73 |-event-p|oint las|
|00004370| 74 2d 63 6f 6d 6d 61 6e | 64 2d 65 76 65 6e 74 20 |t-comman|d-event |
|00004380| 70 6f 73 20 65 64 69 66 | 66 2d 65 76 65 6e 74 2d |pos edif|f-event-|
|00004390| 62 75 66 66 65 72 20 6d | 65 74 61 2d 62 75 66 20 |buffer m|eta-buf |
|000043a0| 65 64 69 66 66 2d 67 65 | 74 2d 6d 65 74 61 2d 69 |ediff-ge|t-meta-i|
|000043b0| 6e 66 6f 20 69 6e 66 6f | 20 75 6e 6d 61 72 6b 20 |nfo info| unmark |
|000043c0| 65 64 69 66 66 2d 73 65 | 74 2d 73 65 73 73 69 6f |ediff-se|t-sessio|
|000043d0| 6e 2d 73 74 61 74 75 73 | 20 6e 69 6c 20 34 32 20 |n-status| nil 42 |
|000043e0| 65 64 69 66 66 2d 75 70 | 64 61 74 65 2d 6d 65 74 |ediff-up|date-met|
|000043f0| 61 2d 62 75 66 66 65 72 | 5d 20 33 20 22 5c 0a 4d |a-buffer|] 3 "\.M|
|00004400| 61 72 6b 20 73 65 73 73 | 69 6f 6e 20 66 6f 72 20 |ark sess|ion for |
|00004410| 61 20 67 72 6f 75 70 20 | 6f 70 65 72 61 74 69 6f |a group |operatio|
|00004420| 6e 2e 20 57 69 74 68 20 | 70 72 65 66 69 78 20 61 |n. With |prefix a|
|00004430| 72 67 2c 20 75 6e 6d 61 | 72 6b 2e 22 20 22 50 22 |rg, unma|rk." "P"|
|00004440| 5d 29 0a 28 66 73 65 74 | 20 27 65 64 69 66 66 2d |]).(fset| 'ediff-|
|00004450| 68 69 64 65 2d 6d 61 72 | 6b 65 64 2d 73 65 73 73 |hide-mar|ked-sess|
|00004460| 69 6f 6e 73 20 23 5b 28 | 75 6e 68 69 64 65 29 20 |ions #[(|unhide) |
|00004470| 22 c0 09 21 09 41 5c 6e | ab 83 c3 aa 81 c4 5c 6e |"..!.A\n|......\n|
|00004480| ab 83 c4 aa 81 c3 c5 c6 | 1e 07 1e 08 1e 09 1e 5c |........|.......\|
|00004490| 6e 1e 0b 1e 0c 0e 0b ab | a1 0e 0b 40 16 07 0e 0b |n.......|...@....|
|000044a0| 41 16 0b cd 0e 07 21 0e | 5c 6e 3d ab 69 0e 08 54 |A.....!.|\n=.i..T|
|000044b0| 16 08 ce 0e 07 0e 09 5c | 22 88 aa 5b 0e 08 c5 56 |.......\|"..[...V|
|000044c0| ab 86 cf 0e 0c 21 aa 8e | d0 20 88 5c 6e ab 85 d1 |.....!..|. .\n...|
|000044d0| d2 21 aa 83 d1 d3 21 2e | 06 87 22 20 5b 65 64 69 |.!....!.|.." [edi|
|000044e0| 66 66 2d 67 65 74 2d 67 | 72 6f 75 70 2d 62 75 66 |ff-get-g|roup-buf|
|000044f0| 66 65 72 20 65 64 69 66 | 66 2d 6d 65 74 61 2d 6c |fer edif|f-meta-l|
|00004500| 69 73 74 20 75 6e 68 69 | 64 65 20 37 33 20 37 32 |ist unhi|de 73 72|
|00004510| 20 30 20 6e 69 6c 20 65 | 6c 74 20 6e 75 6d 4d 61 | 0 nil e|lt numMa|
|00004520| 72 6b 65 64 20 74 6f 20 | 66 72 6f 6d 20 6d 65 74 |rked to |from met|
|00004530| 61 2d 6c 69 73 74 20 67 | 72 70 2d 62 75 66 20 65 |a-list g|rp-buf e|
|00004540| 64 69 66 66 2d 67 65 74 | 2d 73 65 73 73 69 6f 6e |diff-get|-session|
|00004550| 2d 73 74 61 74 75 73 20 | 65 64 69 66 66 2d 73 65 |-status |ediff-se|
|00004560| 74 2d 73 65 73 73 69 6f | 6e 2d 73 74 61 74 75 73 |t-sessio|n-status|
|00004570| 20 65 64 69 66 66 2d 75 | 70 64 61 74 65 2d 6d 65 | ediff-u|pdate-me|
|00004580| 74 61 2d 62 75 66 66 65 | 72 20 62 65 65 70 20 6d |ta-buffe|r beep m|
|00004590| 65 73 73 61 67 65 20 22 | 4e 6f 74 68 69 6e 67 20 |essage "|Nothing |
|000045a0| 74 6f 20 72 65 76 65 61 | 6c 2e 2e 2e 22 20 22 4e |to revea|l..." "N|
|000045b0| 6f 74 68 69 6e 67 20 74 | 6f 20 68 69 64 65 2e 2e |othing t|o hide..|
|000045c0| 2e 22 5d 20 36 20 22 5c | 0a 48 69 64 65 20 6d 61 |."] 6 "\|.Hide ma|
|000045d0| 72 6b 65 64 20 73 65 73 | 73 69 6f 6e 73 2e 20 57 |rked ses|sions. W|
|000045e0| 69 74 68 20 70 72 65 66 | 69 78 20 61 72 67 2c 20 |ith pref|ix arg, |
|000045f0| 75 6e 68 69 64 65 2e 22 | 20 22 50 22 5d 29 0a 28 |unhide."| "P"]).(|
|00004600| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 4d 88 c2 |byte-cod|e "..M..|
|00004610| c3 4d 87 22 20 5b 65 64 | 69 66 66 2d 6f 70 65 72 |.M." [ed|iff-oper|
|00004620| 61 74 65 2d 6f 6e 2d 6d | 61 72 6b 65 64 2d 73 65 |ate-on-m|arked-se|
|00004630| 73 73 69 6f 6e 73 20 23 | 5b 28 6f 70 65 72 61 74 |ssions #|[(operat|
|00004640| 69 6f 6e 29 20 22 c0 09 | 21 09 41 c2 c3 89 c4 1d |ion) "..|!.A.....|
|00004650| 1e 06 1e 07 1e 08 1e 09 | 1e 5c 6e 0e 09 ab a6 0e |........|.\n.....|
|00004660| 09 40 15 0e 09 41 16 09 | 0e 06 54 16 06 cb 0d 21 |.@...A..|..T....!|
|00004670| 0e 08 3d ab 66 8a 0e 07 | 54 16 07 0e 0c 0d 0e 06 |..=.f...|T.......|
|00004680| 5c 22 88 29 aa 56 cd 0e | 5c 6e 21 88 0e 07 2e 06 |\".).V..|\n!.....|
|00004690| 87 22 20 5b 65 64 69 66 | 66 2d 67 65 74 2d 67 72 |." [edif|f-get-gr|
|000046a0| 6f 75 70 2d 62 75 66 66 | 65 72 20 65 64 69 66 66 |oup-buff|er ediff|
|000046b0| 2d 6d 65 74 61 2d 6c 69 | 73 74 20 34 32 20 30 20 |-meta-li|st 42 0 |
|000046c0| 6e 69 6c 20 65 6c 74 20 | 73 65 73 73 69 6f 6e 4e |nil elt |sessionN|
|000046d0| 75 6d 20 6e 75 6d 4d 61 | 72 6b 65 64 20 6d 61 72 |um numMa|rked mar|
|000046e0| 6b 73 79 6d 20 6d 65 74 | 61 2d 6c 69 73 74 20 67 |ksym met|a-list g|
|000046f0| 72 70 2d 62 75 66 20 65 | 64 69 66 66 2d 67 65 74 |rp-buf e|diff-get|
|00004700| 2d 73 65 73 73 69 6f 6e | 2d 73 74 61 74 75 73 20 |-session|-status |
|00004710| 6f 70 65 72 61 74 69 6f | 6e 20 65 64 69 66 66 2d |operatio|n ediff-|
|00004720| 75 70 64 61 74 65 2d 6d | 65 74 61 2d 62 75 66 66 |update-m|eta-buff|
|00004730| 65 72 5d 20 36 5d 20 65 | 64 69 66 66 2d 61 70 70 |er] 6] e|diff-app|
|00004740| 65 6e 64 2d 63 75 73 74 | 6f 6d 2d 64 69 66 66 20 |end-cust|om-diff |
|00004750| 23 5b 28 73 65 73 73 69 | 6f 6e 20 73 65 73 73 69 |#[(sessi|on sessi|
|00004760| 6f 6e 4e 75 6d 29 20 22 | c0 20 ac 84 c1 c2 21 88 |onNum) "|. ....!.|
|00004770| c3 0c 21 0d 0e 06 c7 89 | 1e 08 1e 09 1e 5c 6e 1e |..!.....|.....\n.|
|00004780| 0b 89 1e 0c ab c2 cd 0e | 0c 21 ab bc ce cd 0e 0c |........|.!......|
|00004790| 21 21 ab b4 70 1e 0f 0e | 0c ab a2 cd 0e 0c 21 ab |!!..p...|......!.|
|000047a0| 9c ce cd 0e 0c 21 21 ab | 94 d0 8e 0e 0c 71 88 0e |.....!!.|.....q..|
|000047b0| 11 0e 0c 3d ab 84 0e 12 | 16 08 29 aa 8a 0e 13 d4 |...=....|..).....|
|000047c0| 3d ac 84 c1 d5 21 88 29 | 0e 0b ab 8e cd 0e 0b 21 |=....!.)|.......!|
|000047d0| ab 88 ce cd 0e 0b 21 21 | ac 84 c1 d6 21 88 0e 08 |......!!|....!...|
|000047e0| ab a0 cd 0e 08 21 ab 9a | ce cd 0e 08 21 21 ab 92 |.....!..|....!!..|
|000047f0| 8a 0e 0b 71 88 64 62 88 | d7 0e 08 21 88 d8 63 29 |...q.db.|...!..c)|
|00004800| aa bc 0e 5c 6e d9 3d ab | b1 8a da 0e 1b 21 89 16 |...\n.=.|.....!..|
|00004810| 09 71 88 dc 20 88 dd de | df 0e 20 0e 21 e2 0c 21 |.q.. ...|.. .!..!|
|00004820| e3 0c 21 25 e4 5c 22 88 | 29 8a 0e 0b 71 88 64 62 |..!%.\".|)...q.db|
|00004830| 88 d7 0e 09 21 88 d8 63 | 29 aa 85 c1 e5 0e 26 5c |....!..c|).....&\|
|00004840| 22 2d 87 22 20 5b 65 64 | 69 66 66 2d 63 6f 6c 6c |"-." [ed|iff-coll|
|00004850| 65 63 74 2d 64 69 66 66 | 73 2d 6d 65 74 61 6a 6f |ect-diff|s-metajo|
|00004860| 62 20 65 72 72 6f 72 20 | 22 53 6f 72 72 79 2c 20 |b error |"Sorry, |
|00004870| 49 20 64 6f 6e 27 74 20 | 64 6f 20 74 68 69 73 20 |I don't |do this |
|00004880| 66 6f 72 20 65 76 65 72 | 79 6f 6e 65 2e 2e 2e 22 |for ever|yone..."|
|00004890| 20 65 64 69 66 66 2d 67 | 65 74 2d 73 65 73 73 69 | ediff-g|et-sessi|
|000048a0| 6f 6e 2d 62 75 66 66 65 | 72 20 73 65 73 73 69 6f |on-buffe|r sessio|
|000048b0| 6e 20 65 64 69 66 66 2d | 6d 65 74 61 2d 64 69 66 |n ediff-|meta-dif|
|000048c0| 66 2d 62 75 66 66 65 72 | 20 65 64 69 66 66 2d 6d |f-buffer| ediff-m|
|000048d0| 65 74 61 6a 6f 62 2d 6e | 61 6d 65 20 6e 69 6c 20 |etajob-n|ame nil |
|000048e0| 63 75 73 74 6f 6d 2d 64 | 69 66 66 2d 62 75 66 20 |custom-d|iff-buf |
|000048f0| 74 6d 70 2d 62 75 66 20 | 6d 65 74 61 6a 6f 62 20 |tmp-buf |metajob |
|00004900| 6d 65 74 61 2d 64 69 66 | 66 2d 62 75 66 66 20 73 |meta-dif|f-buff s|
|00004910| 65 73 73 69 6f 6e 2d 62 | 75 66 20 67 65 74 2d 62 |ession-b|uf get-b|
|00004920| 75 66 66 65 72 20 62 75 | 66 66 65 72 2d 6e 61 6d |uffer bu|ffer-nam|
|00004930| 65 20 53 74 61 72 74 42 | 75 66 66 65 72 20 28 28 |e StartB|uffer ((|
|00004940| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00004950| 42 75 66 66 65 72 29 29 | 20 65 64 69 66 66 2d 63 |Buffer))| ediff-c|
|00004960| 6f 6e 74 72 6f 6c 2d 62 | 75 66 66 65 72 20 65 64 |ontrol-b|uffer ed|
|00004970| 69 66 66 2d 63 75 73 74 | 6f 6d 2d 64 69 66 66 2d |iff-cust|om-diff-|
|00004980| 62 75 66 66 65 72 20 74 | 68 69 73 2d 63 6f 6d 6d |buffer t|his-comm|
|00004990| 61 6e 64 20 65 64 69 66 | 66 2d 71 75 69 74 20 22 |and edif|f-quit "|
|000049a0| 59 6f 75 27 76 65 20 6b | 69 6c 6c 65 64 20 61 6e |You've k|illed an|
|000049b0| 20 65 73 73 65 6e 74 69 | 61 6c 20 45 64 69 66 66 | essenti|al Ediff|
|000049c0| 20 62 75 66 66 65 72 2d | 2d 2d 50 6c 65 61 73 65 | buffer-|--Please|
|000049d0| 20 71 75 69 74 20 45 64 | 69 66 66 22 20 22 45 64 | quit Ed|iff" "Ed|
|000049e0| 69 66 66 3a 20 73 6f 6d | 65 74 68 69 6e 67 20 77 |iff: som|ething w|
|000049f0| 72 6f 6e 67 2d 2d 6e 6f | 20 6d 75 6c 74 69 70 6c |rong--no| multipl|
|00004a00| 65 20 64 69 66 66 73 20 | 62 75 66 66 65 72 22 20 |e diffs |buffer" |
|00004a10| 69 6e 73 65 72 74 2d 62 | 75 66 66 65 72 20 22 5c |insert-b|uffer "\|
|00004a20| 6e 22 20 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |n" ediff|-directo|
|00004a30| 72 69 65 73 20 67 65 74 | 2d 62 75 66 66 65 72 2d |ries get|-buffer-|
|00004a40| 63 72 65 61 74 65 20 65 | 64 69 66 66 2d 74 6d 70 |create e|diff-tmp|
|00004a50| 2d 62 75 66 66 65 72 20 | 65 72 61 73 65 2d 62 75 |-buffer |erase-bu|
|00004a60| 66 66 65 72 20 73 68 65 | 6c 6c 2d 63 6f 6d 6d 61 |ffer she|ll-comma|
|00004a70| 6e 64 20 66 6f 72 6d 61 | 74 20 22 25 73 20 25 73 |nd forma|t "%s %s|
|00004a80| 20 25 73 20 25 73 22 20 | 65 64 69 66 66 2d 63 75 | %s %s" |ediff-cu|
|00004a90| 73 74 6f 6d 2d 64 69 66 | 66 2d 70 72 6f 67 72 61 |stom-dif|f-progra|
|00004aa0| 6d 20 65 64 69 66 66 2d | 63 75 73 74 6f 6d 2d 64 |m ediff-|custom-d|
|00004ab0| 69 66 66 2d 6f 70 74 69 | 6f 6e 73 20 65 64 69 66 |iff-opti|ons edif|
|00004ac0| 66 2d 67 65 74 2d 73 65 | 73 73 69 6f 6e 2d 6f 62 |f-get-se|ssion-ob|
|00004ad0| 6a 41 20 65 64 69 66 66 | 2d 67 65 74 2d 73 65 73 |jA ediff|-get-ses|
|00004ae0| 73 69 6f 6e 2d 6f 62 6a | 42 20 74 20 22 53 65 73 |sion-obj|B t "Ses|
|00004af0| 73 69 6f 6e 20 25 64 20 | 69 73 20 6d 61 72 6b 65 |sion %d |is marke|
|00004b00| 64 20 62 75 74 20 69 6e | 61 63 74 69 76 65 2d 2d |d but in|active--|
|00004b10| 63 61 6e 27 74 20 6d 61 | 6b 65 20 69 74 73 20 64 |can't ma|ke its d|
|00004b20| 69 66 66 22 20 73 65 73 | 73 69 6f 6e 4e 75 6d 5d |iff" ses|sionNum]|
|00004b30| 20 39 5d 5d 20 32 29 0a | 28 66 73 65 74 20 27 65 | 9]] 2).|(fset 'e|
|00004b40| 64 69 66 66 2d 63 6f 6c | 6c 65 63 74 2d 63 75 73 |diff-col|lect-cus|
|00004b50| 74 6f 6d 2d 64 69 66 66 | 73 20 23 5b 6e 69 6c 20 |tom-diff|s #[nil |
|00004b60| 22 08 ab 8c c1 08 21 ab | 87 c2 c1 08 21 21 ac 87 |".....!.|....!!..|
|00004b70| c3 c4 c5 c6 5c 22 21 10 | 70 1e 07 08 ab 97 c1 08 |....\"!.|p.......|
|00004b80| 21 ab 92 c2 c1 08 21 21 | ab 8b c8 8e 08 71 88 c9 |!.....!!|.....q..|
|00004b90| 20 88 29 aa 8a 0e 5c 6e | cb 3d ac 84 cc cd 21 88 | .)...\n|.=....!.|
|00004ba0| 29 ce cf 21 d0 56 ab 85 | d1 08 d2 5c 22 87 d3 20 |)..!.V..|...\".. |
|00004bb0| 88 d4 d5 21 87 22 20 5b | 65 64 69 66 66 2d 6d 65 |...!." [|ediff-me|
|00004bc0| 74 61 2d 64 69 66 66 2d | 62 75 66 66 65 72 20 67 |ta-diff-|buffer g|
|00004bd0| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00004be0| 2d 6e 61 6d 65 20 67 65 | 74 2d 62 75 66 66 65 72 |-name ge|t-buffer|
|00004bf0| 2d 63 72 65 61 74 65 20 | 65 64 69 66 66 2d 75 6e |-create |ediff-un|
|00004c00| 69 71 75 65 2d 62 75 66 | 66 65 72 2d 6e 61 6d 65 |ique-buf|fer-name|
|00004c10| 20 22 2a 45 64 69 66 66 | 20 4d 75 6c 74 69 66 69 | "*Ediff| Multifi|
|00004c20| 6c 65 20 44 69 66 66 73 | 22 20 22 2a 22 20 53 74 |le Diffs|" "*" St|
|00004c30| 61 72 74 42 75 66 66 65 | 72 20 28 28 73 65 74 2d |artBuffe|r ((set-|
|00004c40| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00004c50| 65 72 29 29 20 65 72 61 | 73 65 2d 62 75 66 66 65 |er)) era|se-buffe|
|00004c60| 72 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |r this-c|ommand e|
|00004c70| 64 69 66 66 2d 71 75 69 | 74 20 65 72 72 6f 72 20 |diff-qui|t error |
|00004c80| 22 59 6f 75 27 76 65 20 | 6b 69 6c 6c 65 64 20 61 |"You've |killed a|
|00004c90| 6e 20 65 73 73 65 6e 74 | 69 61 6c 20 45 64 69 66 |n essent|ial Edif|
|00004ca0| 66 20 62 75 66 66 65 72 | 2d 2d 2d 50 6c 65 61 73 |f buffer|---Pleas|
|00004cb0| 65 20 71 75 69 74 20 45 | 64 69 66 66 22 20 65 64 |e quit E|diff" ed|
|00004cc0| 69 66 66 2d 6f 70 65 72 | 61 74 65 2d 6f 6e 2d 6d |iff-oper|ate-on-m|
|00004cd0| 61 72 6b 65 64 2d 73 65 | 73 73 69 6f 6e 73 20 65 |arked-se|ssions e|
|00004ce0| 64 69 66 66 2d 61 70 70 | 65 6e 64 2d 63 75 73 74 |diff-app|end-cust|
|00004cf0| 6f 6d 2d 64 69 66 66 20 | 30 20 64 69 73 70 6c 61 |om-diff |0 displa|
|00004d00| 79 2d 62 75 66 66 65 72 | 20 6e 6f 74 2d 74 68 69 |y-buffer| not-thi|
|00004d10| 73 2d 77 69 6e 64 6f 77 | 20 62 65 65 70 20 6d 65 |s-window| beep me|
|00004d20| 73 73 61 67 65 20 22 4e | 6f 20 6d 61 72 6b 65 64 |ssage "N|o marked|
|00004d30| 20 73 65 73 73 69 6f 6e | 73 20 66 6f 75 6e 64 22 | session|s found"|
|00004d40| 5d 20 34 20 22 5c 0a 43 | 6f 6c 6c 65 63 74 20 63 |] 4 "\.C|ollect c|
|00004d50| 75 73 74 6f 6d 20 64 69 | 66 66 73 20 6f 66 20 6d |ustom di|ffs of m|
|00004d60| 61 72 6b 65 64 20 73 65 | 73 73 69 6f 6e 73 20 69 |arked se|ssions i|
|00004d70| 6e 20 62 75 66 66 65 72 | 20 60 2a 45 64 69 66 66 |n buffer| `*Ediff|
|00004d80| 20 4d 75 6c 74 69 66 69 | 6c 65 20 44 69 66 66 73 | Multifi|le Diffs|
|00004d90| 2a 27 2e 0a 54 68 69 73 | 20 6f 70 65 72 61 74 69 |*'..This| operati|
|00004da0| 6f 6e 20 69 73 20 64 65 | 66 69 6e 65 64 20 6f 6e |on is de|fined on|
|00004db0| 6c 79 20 66 6f 72 20 60 | 65 64 69 66 66 2d 64 69 |ly for `|ediff-di|
|00004dc0| 72 65 63 74 6f 72 69 65 | 73 27 20 61 6e 64 0a 60 |rectorie|s' and.`|
|00004dd0| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 79 2d |ediff-di|rectory-|
|00004de0| 72 65 76 69 73 69 6f 6e | 73 27 2c 20 73 69 6e 63 |revision|s', sinc|
|00004df0| 65 20 69 74 73 20 69 6e | 74 65 6e 74 20 69 73 20 |e its in|tent is |
|00004e00| 74 6f 20 70 72 6f 64 75 | 63 65 0a 6d 75 6c 74 69 |to produ|ce.multi|
|00004e10| 66 69 6c 65 20 70 61 74 | 63 68 65 73 2e 20 46 6f |file pat|ches. Fo|
|00004e20| 72 20 60 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |r `ediff|-directo|
|00004e30| 72 79 2d 72 65 76 69 73 | 69 6f 6e 73 27 2c 20 77 |ry-revis|ions', w|
|00004e40| 65 20 69 6e 73 69 73 74 | 20 74 68 61 74 0a 61 6c |e insist| that.al|
|00004e50| 6c 20 6d 61 72 6b 65 64 | 20 73 65 73 73 69 6f 6e |l marked| session|
|00004e60| 73 20 6d 75 73 74 20 62 | 65 20 61 63 74 69 76 65 |s must b|e active|
|00004e70| 2e 22 20 6e 69 6c 5d 29 | 0a 28 66 73 65 74 20 27 |." nil])|.(fset '|
|00004e80| 65 64 69 66 66 2d 64 69 | 72 2d 61 63 74 69 6f 6e |ediff-di|r-action|
|00004e90| 20 23 5b 6e 69 6c 20 22 | c0 09 21 1a c3 09 21 1c | #[nil "|..!...!.|
|00004ea0| c5 0c 5c 6e 5c 22 1e 06 | c7 1e 08 c7 1e 09 c7 1e |..\n\"..|........|
|00004eb0| 5c 6e c7 1e 0b c7 1e 0c | cd 0e 06 21 16 08 ce 0e |\n......|...!....|
|00004ec0| 06 21 16 09 cf 0e 06 21 | 16 5c 6e d0 0e 06 21 16 |.!.....!|.\n...!.|
|00004ed0| 0b d1 0e 06 21 d2 3e ab | 98 d3 20 88 d4 d5 21 ab |....!.>.|.. ...!.|
|00004ee0| 8c d6 0e 06 c7 5c 22 88 | d7 0c 21 88 aa 84 d8 d9 |.....\".|..!.....|
|00004ef0| 21 88 70 1e 1a 0c 83 00 | 02 db 0c 21 83 00 02 dc |!.p.....|...!....|
|00004f00| db 0c 21 21 83 00 02 dd | 8e 0c 71 88 de 0e 09 21 |..!!....|..q....!|
|00004f10| ab df 0e 5c 6e 3b ab da | de 0e 5c 6e 21 ab d4 0e |...\n;..|..\n!...|
|00004f20| 0b 3b ab 86 de 0e 09 21 | aa 81 df ab c6 0e 08 ab |.;.....!|........|
|00004f30| 95 db 0e 08 21 ab 8f dc | db 0e 08 21 21 ab 87 e0 |....!...|...!!...|
|00004f40| 0e 08 21 82 fd 01 e1 e2 | c7 e3 23 16 0c e4 0e 09 |..!.....|..#.....|
|00004f50| 0e 5c 6e 0e 0b 0e 0c 0e | 25 0e 26 e7 e8 c7 e9 ea |.\n.....|%.&.....|
|00004f60| eb 0e 2c 44 45 ed eb 0e | 06 44 ee 42 42 46 44 26 |..,DE...|.D.BBFD&|
|00004f70| 07 82 fd 01 c7 1e 2f f0 | 0e 2f 21 29 ab c7 de 0e |....../.|./!)....|
|00004f80| 09 21 ab c1 0e 08 ab 95 | db 0e 08 21 ab 8f dc db |.!......|...!....|
|00004f90| 0e 08 21 21 ab 87 e0 0e | 08 21 82 fd 01 e1 e2 c7 |..!!....|.!......|
|00004fa0| e3 23 16 0c f1 0e 09 0e | 0c 0e 25 0e 26 e7 e8 c7 |.#......|..%.&...|
|00004fb0| e9 ea eb 0e 2c 44 45 ed | eb 0e 06 44 f2 42 42 46 |....,DE.|...D.BBF|
|00004fc0| 44 25 82 fd 01 0e 08 ab | bc db 0e 08 21 ab b6 dc |D%......|....!...|
|00004fd0| db 0e 08 21 21 ab ae 70 | 1e 1a 0e 08 ab 9a db 0e |...!!..p|........|
|00004fe0| 08 21 ab 94 dc db 0e 08 | 21 21 ab 8c f3 8e 0e 08 |.!......|!!......|
|00004ff0| 71 88 f4 f5 21 29 aa 89 | 0e 36 f7 3d ae 83 d8 f8 |q...!)..|.6.=....|
|00005000| 21 29 82 fd 01 f9 0e 06 | 21 ab a6 d3 20 88 d4 fa |!)......|!... ...|
|00005010| 21 ab 99 fb 0e 09 0e 5c | 6e e7 e8 c7 e9 ec 70 45 |!......\|n.....pE|
|00005020| ed eb 0e 06 44 fc 42 42 | 46 44 23 aa f1 d8 d9 21 |....D.BB|FD#....!|
|00005030| aa ec c7 1e 2f f0 0e 2f | 21 29 ab 98 0e 25 0e 09 |..../../|!)...%..|
|00005040| e7 e8 c7 e9 ec 70 45 ed | eb 0e 06 44 fd 42 42 46 |.....pE.|...D.BBF|
|00005050| 44 5c 22 aa ca c7 1e 2f | 0e 26 fe 3e 29 ac 9a 0e |D\"..../|.&.>)...|
|00005060| 25 0e 09 0e 5c 6e e7 e8 | c7 e9 ec 70 45 ed eb 0e |%...\n..|...pE...|
|00005070| 06 44 ff 42 42 46 44 23 | aa a6 c7 1e 2f 0e 26 fe |.D.BBFD#|..../.&.|
|00005080| 3e 29 ad 9c 0e 25 0e 09 | 0e 5c 6e 0e 0b e7 e8 c7 |>)...%..|.\n.....|
|00005090| e9 ec 70 45 ed eb 0e 06 | 44 81 40 00 42 42 46 44 |..pE....|D.@.BBFD|
|000050a0| 24 29 aa 89 0e 36 f7 3d | ae 83 d8 f8 21 2e 09 87 |$)...6.=|....!...|
|000050b0| 22 20 5b 65 64 69 66 66 | 2d 65 76 65 6e 74 2d 70 |" [ediff|-event-p|
|000050c0| 6f 69 6e 74 20 6c 61 73 | 74 2d 63 6f 6d 6d 61 6e |oint las|t-comman|
|000050d0| 64 2d 65 76 65 6e 74 20 | 70 6f 73 20 65 64 69 66 |d-event |pos edif|
|000050e0| 66 2d 65 76 65 6e 74 2d | 62 75 66 66 65 72 20 6d |f-event-|buffer m|
|000050f0| 65 74 61 2d 62 75 66 20 | 65 64 69 66 66 2d 67 65 |eta-buf |ediff-ge|
|00005100| 74 2d 6d 65 74 61 2d 69 | 6e 66 6f 20 69 6e 66 6f |t-meta-i|nfo info|
|00005110| 20 6e 69 6c 20 73 65 73 | 73 69 6f 6e 2d 62 75 66 | nil ses|sion-buf|
|00005120| 20 66 69 6c 65 31 20 66 | 69 6c 65 32 20 66 69 6c | file1 f|ile2 fil|
|00005130| 65 33 20 72 65 67 65 78 | 70 20 65 64 69 66 66 2d |e3 regex|p ediff-|
|00005140| 67 65 74 2d 73 65 73 73 | 69 6f 6e 2d 62 75 66 66 |get-sess|ion-buff|
|00005150| 65 72 20 65 64 69 66 66 | 2d 67 65 74 2d 73 65 73 |er ediff|-get-ses|
|00005160| 73 69 6f 6e 2d 6f 62 6a | 41 20 65 64 69 66 66 2d |sion-obj|A ediff-|
|00005170| 67 65 74 2d 73 65 73 73 | 69 6f 6e 2d 6f 62 6a 42 |get-sess|ion-objB|
|00005180| 20 65 64 69 66 66 2d 67 | 65 74 2d 73 65 73 73 69 | ediff-g|et-sessi|
|00005190| 6f 6e 2d 6f 62 6a 43 20 | 65 64 69 66 66 2d 67 65 |on-objC |ediff-ge|
|000051a0| 74 2d 73 65 73 73 69 6f | 6e 2d 73 74 61 74 75 73 |t-sessio|n-status|
|000051b0| 20 28 37 32 20 37 33 29 | 20 62 65 65 70 20 79 2d | (72 73)| beep y-|
|000051c0| 6f 72 2d 6e 2d 70 20 22 | 54 68 69 73 20 73 65 73 |or-n-p "|This ses|
|000051d0| 73 69 6f 6e 20 69 73 20 | 6d 61 72 6b 65 64 20 61 |sion is |marked a|
|000051e0| 73 20 68 69 64 64 65 6e | 2c 20 75 6e 6d 61 72 6b |s hidden|, unmark|
|000051f0| 3f 20 22 20 65 64 69 66 | 66 2d 73 65 74 2d 73 65 |? " edif|f-set-se|
|00005200| 73 73 69 6f 6e 2d 73 74 | 61 74 75 73 20 65 64 69 |ssion-st|atus edi|
|00005210| 66 66 2d 75 70 64 61 74 | 65 2d 6d 65 74 61 2d 62 |ff-updat|e-meta-b|
|00005220| 75 66 66 65 72 20 65 72 | 72 6f 72 20 22 41 62 6f |uffer er|ror "Abo|
|00005230| 72 74 65 64 22 20 53 74 | 61 72 74 42 75 66 66 65 |rted" St|artBuffe|
|00005240| 72 20 67 65 74 2d 62 75 | 66 66 65 72 20 62 75 66 |r get-bu|ffer buf|
|00005250| 66 65 72 2d 6e 61 6d 65 | 20 28 28 73 65 74 2d 62 |fer-name| ((set-b|
|00005260| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00005270| 72 29 29 20 66 69 6c 65 | 2d 64 69 72 65 63 74 6f |r)) file|-directo|
|00005280| 72 79 2d 70 20 74 20 65 | 64 69 66 66 2d 73 68 6f |ry-p t e|diff-sho|
|00005290| 77 2d 6d 65 74 61 2d 62 | 75 66 66 65 72 20 72 65 |w-meta-b|uffer re|
|000052a0| 61 64 2d 73 74 72 69 6e | 67 20 22 46 69 6c 74 65 |ad-strin|g "Filte|
|000052b0| 72 20 74 68 72 6f 75 67 | 68 20 72 65 67 75 6c 61 |r throug|h regula|
|000052c0| 72 20 65 78 70 72 65 73 | 73 69 6f 6e 3a 20 22 20 |r expres|sion: " |
|000052d0| 65 64 69 66 66 2d 66 69 | 6c 74 65 72 69 6e 67 2d |ediff-fi|ltering-|
|000052e0| 72 65 67 65 78 70 2d 68 | 69 73 74 6f 72 79 20 65 |regexp-h|istory e|
|000052f0| 64 69 66 66 2d 64 69 72 | 65 63 74 6f 72 69 65 73 |diff-dir|ectories|
|00005300| 2d 69 6e 74 65 72 6e 61 | 6c 20 65 64 69 66 66 2d |-interna|l ediff-|
|00005310| 73 65 73 73 69 6f 6e 2d | 61 63 74 69 6f 6e 2d 66 |session-|action-f|
|00005320| 75 6e 63 74 69 6f 6e 20 | 65 64 69 66 66 2d 6d 65 |unction |ediff-me|
|00005330| 74 61 6a 6f 62 2d 6e 61 | 6d 65 20 6c 69 73 74 20 |tajob-na|me list |
|00005340| 6c 61 6d 62 64 61 20 73 | 65 74 71 20 65 64 69 66 |lambda s|etq edif|
|00005350| 66 2d 70 61 72 65 6e 74 | 2d 6d 65 74 61 2d 62 75 |f-parent|-meta-bu|
|00005360| 66 66 65 72 20 71 75 6f | 74 65 20 65 64 69 66 66 |ffer quo|te ediff|
|00005370| 2d 6d 65 74 61 2d 62 75 | 66 66 65 72 20 73 65 74 |-meta-bu|ffer set|
|00005380| 63 61 72 20 28 65 64 69 | 66 66 2d 6d 65 74 61 2d |car (edi|ff-meta-|
|00005390| 62 75 66 66 65 72 29 20 | 6d 65 74 61 6a 6f 62 20 |buffer) |metajob |
|000053a0| 65 64 69 66 66 2d 72 65 | 76 69 73 69 6f 6e 2d 6d |ediff-re|vision-m|
|000053b0| 65 74 61 6a 6f 62 20 65 | 64 69 66 66 2d 64 69 72 |etajob e|diff-dir|
|000053c0| 65 63 74 6f 72 79 2d 72 | 65 76 69 73 69 6f 6e 73 |ectory-r|evisions|
|000053d0| 2d 69 6e 74 65 72 6e 61 | 6c 20 28 65 64 69 66 66 |-interna|l (ediff|
|000053e0| 2d 6d 65 74 61 2d 62 75 | 66 66 65 72 29 20 28 28 |-meta-bu|ffer) ((|
|000053f0| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00005400| 42 75 66 66 65 72 29 29 | 20 65 64 69 66 66 2d 72 |Buffer))| ediff-r|
|00005410| 65 63 65 6e 74 65 72 20 | 6e 6f 2d 72 65 68 69 67 |ecenter |no-rehig|
|00005420| 68 6c 69 67 68 74 20 74 | 68 69 73 2d 63 6f 6d 6d |hlight t|his-comm|
|00005430| 61 6e 64 20 65 64 69 66 | 66 2d 71 75 69 74 20 22 |and edif|f-quit "|
|00005440| 59 6f 75 27 76 65 20 6b | 69 6c 6c 65 64 20 61 6e |You've k|illed an|
|00005450| 20 65 73 73 65 6e 74 69 | 61 6c 20 45 64 69 66 66 | essenti|al Ediff|
|00005460| 20 62 75 66 66 65 72 2d | 2d 2d 50 6c 65 61 73 65 | buffer-|--Please|
|00005470| 20 71 75 69 74 20 45 64 | 69 66 66 22 20 65 64 69 | quit Ed|iff" edi|
|00005480| 66 66 2d 70 72 6f 62 6c | 65 6d 61 74 69 63 2d 73 |ff-probl|ematic-s|
|00005490| 65 73 73 69 6f 6e 2d 70 | 20 22 54 68 69 73 20 73 |ession-p| "This s|
|000054a0| 65 73 73 69 6f 6e 27 73 | 20 61 6e 63 65 73 74 6f |ession's| ancesto|
|000054b0| 72 20 69 73 20 61 20 64 | 69 72 65 63 74 6f 72 79 |r is a d|irectory|
|000054c0| 2c 20 6d 65 72 67 65 20 | 77 69 74 68 6f 75 74 20 |, merge |without |
|000054d0| 74 68 65 20 61 6e 63 65 | 73 74 6f 72 3f 20 22 20 |the ance|stor? " |
|000054e0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 66 69 6c 65 |ediff-me|rge-file|
|000054f0| 73 20 28 65 64 69 66 66 | 2d 63 6f 6e 74 72 6f 6c |s (ediff|-control|
|00005500| 2d 62 75 66 66 65 72 29 | 20 28 65 64 69 66 66 2d |-buffer)| (ediff-|
|00005510| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 66 65 72 29 20 |control-|buffer) |
|00005520| 28 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 |(ediff-m|erge-dir|
|00005530| 65 63 74 6f 72 69 65 73 | 2d 77 69 74 68 2d 61 6e |ectories|-with-an|
|00005540| 63 65 73 74 6f 72 20 65 | 64 69 66 66 2d 6d 65 72 |cestor e|diff-mer|
|00005550| 67 65 2d 66 69 6c 65 67 | 72 6f 75 70 73 2d 77 69 |ge-fileg|roups-wi|
|00005560| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |th-ances|tor edif|
|00005570| 66 2d 64 69 72 65 63 74 | 6f 72 69 65 73 33 20 65 |f-direct|ories3 e|
|00005580| 64 69 66 66 2d 66 69 6c | 65 67 72 6f 75 70 73 33 |diff-fil|egroups3|
|00005590| 29 20 28 65 64 69 66 66 | 2d 63 6f 6e 74 72 6f 6c |) (ediff|-control|
|000055a0| 2d 62 75 66 66 65 72 29 | 20 28 65 64 69 66 66 2d |-buffer)| (ediff-|
|000055b0| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 66 65 72 29 5d |control-|buffer)]|
|000055c0| 20 31 34 20 22 5c 0a 45 | 78 65 63 75 74 65 20 61 | 14 "\.E|xecute a|
|000055d0| 70 70 72 6f 70 72 69 61 | 74 65 20 61 63 74 69 6f |ppropria|te actio|
|000055e0| 6e 20 66 6f 72 20 74 68 | 65 20 73 65 6c 65 63 74 |n for th|e select|
|000055f0| 65 64 20 73 65 73 73 69 | 6f 6e 2e 22 20 6e 69 6c |ed sessi|on." nil|
|00005600| 5d 29 0a 28 66 73 65 74 | 20 27 65 64 69 66 66 2d |]).(fset| 'ediff-|
|00005610| 72 65 67 69 73 74 72 79 | 2d 61 63 74 69 6f 6e 20 |registry|-action |
|00005620| 23 5b 6e 69 6c 20 22 c0 | 09 21 1a c3 09 21 1c c5 |#[nil ".|.!...!..|
|00005630| 0c 5c 6e 5c 22 89 1e 06 | ab f0 c7 0e 06 21 ab ea |.\n\"...|.....!..|
|00005640| c8 c7 0e 06 21 21 ab e2 | 70 1e 09 0e 06 ab 9c c7 |....!!..|p.......|
|00005650| 0e 06 21 ab 96 c8 c7 0e | 06 21 21 ab 8e ca 8e 0e |..!.....|.!!.....|
|00005660| 06 71 88 cb cc 21 29 cd | 3d aa 89 0e 0e cf 3d ae |.q...!).|=.....=.|
|00005670| 83 d0 d1 21 29 ab 86 d2 | 0e 06 21 aa b6 70 1e 09 |...!)...|..!..p..|
|00005680| 0e 06 ab 9a c7 0e 06 21 | ab 94 c8 c7 0e 06 21 21 |.......!|......!!|
|00005690| ab 8c d3 8e 0e 06 71 88 | d4 d5 21 29 aa 89 0e 0e |......q.|..!)....|
|000056a0| cf 3d ae 83 d0 d1 21 29 | aa 89 d6 20 88 d7 d8 21 |.=....!)|... ...!|
|000056b0| 88 d9 20 2b 87 22 20 5b | 65 64 69 66 66 2d 65 76 |.. +." [|ediff-ev|
|000056c0| 65 6e 74 2d 70 6f 69 6e | 74 20 6c 61 73 74 2d 63 |ent-poin|t last-c|
|000056d0| 6f 6d 6d 61 6e 64 2d 65 | 76 65 6e 74 20 70 6f 73 |ommand-e|vent pos|
|000056e0| 20 65 64 69 66 66 2d 65 | 76 65 6e 74 2d 62 75 66 | ediff-e|vent-buf|
|000056f0| 66 65 72 20 62 75 66 20 | 65 64 69 66 66 2d 67 65 |fer buf |ediff-ge|
|00005700| 74 2d 6d 65 74 61 2d 69 | 6e 66 6f 20 63 74 6c 2d |t-meta-i|nfo ctl-|
|00005710| 62 75 66 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |buf get-|buffer b|
|00005720| 75 66 66 65 72 2d 6e 61 | 6d 65 20 53 74 61 72 74 |uffer-na|me Start|
|00005730| 42 75 66 66 65 72 20 28 | 28 73 65 74 2d 62 75 66 |Buffer (|(set-buf|
|00005740| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|00005750| 29 20 6b 65 79 2d 62 69 | 6e 64 69 6e 67 20 22 71 |) key-bi|nding "q|
|00005760| 22 20 65 64 69 66 66 2d | 71 75 69 74 2d 6d 65 74 |" ediff-|quit-met|
|00005770| 61 2d 62 75 66 66 65 72 | 20 74 68 69 73 2d 63 6f |a-buffer| this-co|
|00005780| 6d 6d 61 6e 64 20 65 64 | 69 66 66 2d 71 75 69 74 |mmand ed|iff-quit|
|00005790| 20 65 72 72 6f 72 20 22 | 59 6f 75 27 76 65 20 6b | error "|You've k|
|000057a0| 69 6c 6c 65 64 20 61 6e | 20 65 73 73 65 6e 74 69 |illed an| essenti|
|000057b0| 61 6c 20 45 64 69 66 66 | 20 62 75 66 66 65 72 2d |al Ediff| buffer-|
|000057c0| 2d 2d 50 6c 65 61 73 65 | 20 71 75 69 74 20 45 64 |--Please| quit Ed|
|000057d0| 69 66 66 22 20 65 64 69 | 66 66 2d 73 68 6f 77 2d |iff" edi|ff-show-|
|000057e0| 6d 65 74 61 2d 62 75 66 | 66 65 72 20 28 28 73 65 |meta-buf|fer ((se|
|000057f0| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|00005800| 66 66 65 72 29 29 20 65 | 64 69 66 66 2d 72 65 63 |ffer)) e|diff-rec|
|00005810| 65 6e 74 65 72 20 6e 6f | 2d 72 65 68 69 67 68 6c |enter no|-rehighl|
|00005820| 69 67 68 74 20 62 65 65 | 70 20 6d 65 73 73 61 67 |ight bee|p messag|
|00005830| 65 20 22 59 6f 75 27 76 | 65 20 73 65 6c 65 63 74 |e "You'v|e select|
|00005840| 65 64 20 61 20 73 74 61 | 6c 65 20 73 65 73 73 69 |ed a sta|le sessi|
|00005850| 6f 6e 20 2d 2d 2d 20 74 | 72 79 20 61 67 61 69 6e |on --- t|ry again|
|00005860| 22 20 65 64 69 66 66 2d | 75 70 64 61 74 65 2d 72 |" ediff-|update-r|
|00005870| 65 67 69 73 74 72 79 5d | 20 34 20 22 5c 0a 53 77 |egistry]| 4 "\.Sw|
|00005880| 69 74 63 68 20 74 6f 20 | 61 20 73 65 6c 65 63 74 |itch to |a select|
|00005890| 65 64 20 73 65 73 73 69 | 6f 6e 2e 22 20 6e 69 6c |ed sessi|on." nil|
|000058a0| 5d 29 0a 28 66 73 65 74 | 20 27 65 64 69 66 66 2d |]).(fset| 'ediff-|
|000058b0| 73 68 6f 77 2d 6d 65 74 | 61 2d 62 75 66 66 65 72 |show-met|a-buffer|
|000058c0| 20 23 5b 28 26 6f 70 74 | 69 6f 6e 61 6c 20 6d 65 | #[(&opt|ional me|
|000058d0| 74 61 2d 62 75 66 29 20 | 22 c0 89 89 19 1a 1b 0c |ta-buf) |".......|
|000058e0| ab 82 c5 11 0c ae 82 0e | 06 14 c7 0c 21 ac 86 c8 |........|....!...|
|000058f0| c9 21 88 aa 93 0c ab 8c | ca 0c 21 ab 87 cb ca 0c |.!......|..!.....|
|00005900| 21 21 ac 84 c8 cc 21 88 | cd 0c 21 88 70 1e 0e 0c |!!....!.|..!.p...|
|00005910| 83 d2 00 ca 0c 21 83 d2 | 00 cb ca 0c 21 21 83 d2 |.....!..|....!!..|
|00005920| 00 cf 8e 0c 71 88 8a d0 | 0c 21 89 13 ab 92 09 ac |....q...|.!......|
|00005930| 84 d1 d2 21 88 d3 0b 0c | 5c 22 88 d4 0b 21 88 aa |...!....|\"...!..|
|00005940| e8 d5 0e 16 89 13 21 ab | 8c d3 0e 16 0c 5c 22 88 |......!.|.....\".|
|00005950| d4 0b 21 88 aa d4 d5 0e | 17 89 13 21 ab 8c d3 0e |..!.....|...!....|
|00005960| 17 0c 5c 22 88 d4 0b 21 | 88 aa c0 d5 0e 18 89 13 |..\"...!|........|
|00005970| 21 ab 8c d3 0e 18 0c 5c | 22 88 d4 0b 21 88 aa ac |!......\|"...!...|
|00005980| d0 0e 19 21 89 13 ab 9a | da 20 ab 96 da 20 db 3e |...!....|. ... .>|
|00005990| ac 90 d4 0b 21 88 dc dd | 21 88 d3 de 20 0c 5c 22 |....!...|!... .\"|
|000059a0| 88 aa 8a df e0 21 88 d3 | de 20 0c 5c 22 88 2a aa |.....!..|. .\".*.|
|000059b0| 8a 0e 21 e2 3d ac 84 c8 | e3 21 88 29 da 20 ab 94 |..!.=...|.!.). ..|
|000059c0| da 20 db 3e ac 8e e4 d0 | 0c 21 21 12 e5 5c 6e 21 |. .>....|.!!..\n!|
|000059d0| 88 e6 5c 6e 21 88 e7 e8 | 21 2b 87 22 20 5b 6e 69 |..\n!...|!+." [ni|
|000059e0| 6c 20 73 69 6c 65 6e 74 | 20 66 72 61 6d 65 20 77 |l silent| frame w|
|000059f0| 69 6e 64 20 6d 65 74 61 | 2d 62 75 66 20 74 20 65 |ind meta|-buf t e|
|00005a00| 64 69 66 66 2d 6d 65 74 | 61 2d 62 75 66 66 65 72 |diff-met|a-buffer|
|00005a10| 20 62 75 66 66 65 72 70 | 20 65 72 72 6f 72 20 22 | bufferp| error "|
|00005a20| 54 68 69 73 20 45 64 69 | 66 66 20 73 65 73 73 69 |This Edi|ff sessi|
|00005a30| 6f 6e 20 69 73 20 6e 6f | 74 20 70 61 72 74 20 6f |on is no|t part o|
|00005a40| 66 20 61 20 73 65 73 73 | 69 6f 6e 20 67 72 6f 75 |f a sess|ion grou|
|00005a50| 70 22 20 67 65 74 2d 62 | 75 66 66 65 72 20 62 75 |p" get-b|uffer bu|
|00005a60| 66 66 65 72 2d 6e 61 6d | 65 20 22 43 61 6e 27 74 |ffer-nam|e "Can't|
|00005a70| 20 66 69 6e 64 20 74 68 | 69 73 20 73 65 73 73 69 | find th|is sessi|
|00005a80| 6f 6e 27 73 20 67 72 6f | 75 70 20 70 61 6e 65 6c |on's gro|up panel|
|00005a90| 20 2d 2d 20 73 65 73 73 | 69 6f 6e 20 69 74 73 65 | -- sess|ion itse|
|00005aa0| 6c 66 20 69 73 20 6f 6b | 22 20 65 64 69 66 66 2d |lf is ok|" ediff-|
|00005ab0| 63 6c 65 61 6e 75 70 2d | 6d 65 74 61 2d 62 75 66 |cleanup-|meta-buf|
|00005ac0| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 20 |fer Star|tBuffer |
|00005ad0| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00005ae0| 72 74 42 75 66 66 65 72 | 29 29 20 65 64 69 66 66 |rtBuffer|)) ediff|
|00005af0| 2d 67 65 74 2d 76 69 73 | 69 62 6c 65 2d 62 75 66 |-get-vis|ible-buf|
|00005b00| 66 65 72 2d 77 69 6e 64 | 6f 77 20 6d 65 73 73 61 |fer-wind|ow messa|
|00005b10| 67 65 20 22 41 6c 72 65 | 61 64 79 20 73 68 6f 77 |ge "Alre|ady show|
|00005b20| 69 6e 67 20 74 68 65 20 | 67 72 6f 75 70 20 70 61 |ing the |group pa|
|00005b30| 6e 65 6c 20 66 6f 72 20 | 74 68 69 73 20 73 65 73 |nel for |this ses|
|00005b40| 73 69 6f 6e 22 20 73 65 | 74 2d 77 69 6e 64 6f 77 |sion" se|t-window|
|00005b50| 2d 62 75 66 66 65 72 20 | 73 65 6c 65 63 74 2d 77 |-buffer |select-w|
|00005b60| 69 6e 64 6f 77 20 77 69 | 6e 64 6f 77 2d 6c 69 76 |indow wi|ndow-liv|
|00005b70| 65 2d 70 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |e-p edif|f-window|
|00005b80| 2d 43 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 2d |-C ediff|-window-|
|00005b90| 41 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 2d 42 |A ediff-|window-B|
|00005ba0| 20 65 64 69 66 66 2d 72 | 65 67 69 73 74 72 79 2d | ediff-r|egistry-|
|00005bb0| 62 75 66 66 65 72 20 65 | 64 69 66 66 2d 64 65 76 |buffer e|diff-dev|
|00005bc0| 69 63 65 2d 74 79 70 65 | 20 28 74 74 79 20 73 74 |ice-type| (tty st|
|00005bd0| 72 65 61 6d 29 20 6f 74 | 68 65 72 2d 77 69 6e 64 |ream) ot|her-wind|
|00005be0| 6f 77 20 31 20 73 65 6c | 65 63 74 65 64 2d 77 69 |ow 1 sel|ected-wi|
|00005bf0| 6e 64 6f 77 20 65 64 69 | 66 66 2d 73 6b 69 70 2d |ndow edi|ff-skip-|
|00005c00| 75 6e 73 75 69 74 61 62 | 6c 65 2d 66 72 61 6d 65 |unsuitab|le-frame|
|00005c10| 73 20 6f 6b 2d 75 6e 73 | 70 6c 69 74 74 61 62 6c |s ok-uns|plittabl|
|00005c20| 65 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |e this-c|ommand e|
|00005c30| 64 69 66 66 2d 71 75 69 | 74 20 22 59 6f 75 27 76 |diff-qui|t "You'v|
|00005c40| 65 20 6b 69 6c 6c 65 64 | 20 61 6e 20 65 73 73 65 |e killed| an esse|
|00005c50| 6e 74 69 61 6c 20 45 64 | 69 66 66 20 62 75 66 66 |ntial Ed|iff buff|
|00005c60| 65 72 2d 2d 2d 50 6c 65 | 61 73 65 20 71 75 69 74 |er---Ple|ase quit|
|00005c70| 20 45 64 69 66 66 22 20 | 77 69 6e 64 6f 77 2d 66 | Ediff" |window-f|
|00005c80| 72 61 6d 65 20 72 61 69 | 73 65 2d 66 72 61 6d 65 |rame rai|se-frame|
|00005c90| 20 65 64 69 66 66 2d 72 | 65 73 65 74 2d 6d 6f 75 | ediff-r|eset-mou|
|00005ca0| 73 65 20 72 75 6e 2d 68 | 6f 6f 6b 73 20 65 64 69 |se run-h|ooks edi|
|00005cb0| 66 66 2d 73 68 6f 77 2d | 73 65 73 73 69 6f 6e 2d |ff-show-|session-|
|00005cc0| 67 72 6f 75 70 2d 68 6f | 6f 6b 73 5d 20 33 20 22 |group-ho|oks] 3 "|
|00005cd0| 5c 0a 53 68 6f 77 20 74 | 68 65 20 73 65 73 73 69 |\.Show t|he sessi|
|00005ce0| 6f 6e 20 67 72 6f 75 70 | 20 62 75 66 66 65 72 2e |on group| buffer.|
|00005cf0| 22 20 6e 69 6c 5d 29 0a | 28 66 73 65 74 20 27 65 |" nil]).|(fset 'e|
|00005d00| 64 69 66 66 2d 73 68 6f | 77 2d 6d 65 74 61 2d 62 |diff-sho|w-meta-b|
|00005d10| 75 66 66 2d 66 72 6f 6d | 2d 72 65 67 69 73 74 72 |uff-from|-registr|
|00005d20| 79 20 23 5b 6e 69 6c 20 | 22 c0 09 21 1a c3 09 21 |y #[nil |"..!...!|
|00005d30| 1c c5 0c 5c 6e 5c 22 89 | 1e 06 1e 07 70 1e 08 0e |...\n\".|....p...|
|00005d40| 07 ab 99 c9 0e 07 21 ab | 93 ca c9 0e 07 21 21 ab |......!.|.....!!.|
|00005d50| 8b cb 8e 0e 07 71 88 cc | 20 29 aa 89 0e 0d ce 3d |.....q..| ).....=|
|00005d60| ae 83 cf d0 21 2d 87 22 | 20 5b 65 64 69 66 66 2d |....!-."| [ediff-|
|00005d70| 65 76 65 6e 74 2d 70 6f | 69 6e 74 20 6c 61 73 74 |event-po|int last|
|00005d80| 2d 63 6f 6d 6d 61 6e 64 | 2d 65 76 65 6e 74 20 70 |-command|-event p|
|00005d90| 6f 73 20 65 64 69 66 66 | 2d 65 76 65 6e 74 2d 62 |os ediff|-event-b|
|00005da0| 75 66 66 65 72 20 6d 65 | 74 61 2d 62 75 66 20 65 |uffer me|ta-buf e|
|00005db0| 64 69 66 66 2d 67 65 74 | 2d 6d 65 74 61 2d 69 6e |diff-get|-meta-in|
|00005dc0| 66 6f 20 69 6e 66 6f 20 | 6d 65 74 61 2d 6f 72 2d |fo info |meta-or-|
|00005dd0| 73 65 73 73 69 6f 6e 2d | 62 75 66 20 53 74 61 72 |session-|buf Star|
|00005de0| 74 42 75 66 66 65 72 20 | 67 65 74 2d 62 75 66 66 |tBuffer |get-buff|
|00005df0| 65 72 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 28 |er buffe|r-name (|
|00005e00| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00005e10| 74 42 75 66 66 65 72 29 | 29 20 65 64 69 66 66 2d |tBuffer)|) ediff-|
|00005e20| 73 68 6f 77 2d 6d 65 74 | 61 2d 62 75 66 66 65 72 |show-met|a-buffer|
|00005e30| 20 74 68 69 73 2d 63 6f | 6d 6d 61 6e 64 20 65 64 | this-co|mmand ed|
|00005e40| 69 66 66 2d 71 75 69 74 | 20 65 72 72 6f 72 20 22 |iff-quit| error "|
|00005e50| 59 6f 75 27 76 65 20 6b | 69 6c 6c 65 64 20 61 6e |You've k|illed an|
|00005e60| 20 65 73 73 65 6e 74 69 | 61 6c 20 45 64 69 66 66 | essenti|al Ediff|
|00005e70| 20 62 75 66 66 65 72 2d | 2d 2d 50 6c 65 61 73 65 | buffer-|--Please|
|00005e80| 20 71 75 69 74 20 45 64 | 69 66 66 22 5d 20 34 20 | quit Ed|iff"] 4 |
|00005e90| 22 5c 0a 44 69 73 70 6c | 61 79 20 74 68 65 20 73 |"\.Displ|ay the s|
|00005ea0| 65 73 73 69 6f 6e 20 67 | 72 6f 75 70 20 62 75 66 |ession g|roup buf|
|00005eb0| 66 65 72 20 66 6f 72 20 | 61 20 73 65 6c 65 63 74 |fer for |a select|
|00005ec0| 65 64 20 73 65 73 73 69 | 6f 6e 20 67 72 6f 75 70 |ed sessi|on group|
|00005ed0| 2e 22 20 6e 69 6c 5d 29 | 0a 28 66 73 65 74 20 27 |." nil])|.(fset '|
|00005ee0| 65 64 69 66 66 2d 73 68 | 6f 77 2d 72 65 67 69 73 |ediff-sh|ow-regis|
|00005ef0| 74 72 79 20 23 5b 6e 69 | 6c 20 22 c0 20 88 09 ab |try #[ni|l ". ...|
|00005f00| 8c c2 09 21 ab 87 c3 c2 | 09 21 21 ac 84 c4 c5 21 |...!....|.!!....!|
|00005f10| 88 c6 89 1e 07 1e 08 70 | 1e 09 09 83 ba 00 c2 09 |.......p|........|
|00005f20| 21 83 ba 00 c3 c2 09 21 | 21 83 ba 00 ca 8e 09 71 |!......!|!......q|
|00005f30| 88 8a cb 09 21 89 16 08 | ab 91 cc cd 21 88 ce 0e |....!...|....!...|
|00005f40| 08 09 5c 22 88 cf 0e 08 | 21 88 aa e7 d0 0e 11 21 |..\"....|!......!|
|00005f50| ab 8d ce 0e 11 09 5c 22 | 88 cf 0e 11 21 88 aa d4 |......\"|....!...|
|00005f60| d0 0e 12 21 ab 8d ce 0e | 12 09 5c 22 88 cf 0e 12 |...!....|..\"....|
|00005f70| 21 88 aa c1 d0 0e 13 21 | ab 8d ce 0e 13 09 5c 22 |!......!|......\"|
|00005f80| 88 cf 0e 13 21 88 aa ae | cb 0e 14 21 89 16 08 ab |....!...|...!....|
|00005f90| 9b d5 20 ab 97 d5 20 d6 | 3e ac 91 cf 0e 08 21 88 |.. ... .|>.....!.|
|00005fa0| d7 d8 21 88 ce d9 20 09 | 5c 22 88 aa 8a da db 21 |..!... .|\".....!|
|00005fb0| 88 ce d9 20 09 5c 22 88 | 2a aa 8a 0e 1c dd 3d ac |... .\".|*.....=.|
|00005fc0| 84 c4 de 21 88 29 d5 20 | ab 97 d5 20 d6 3e ac 91 |...!.). |... .>..|
|00005fd0| df cb 09 21 21 16 07 e0 | 0e 07 21 88 e1 0e 07 21 |...!!...|..!....!|
|00005fe0| 88 e2 e3 21 2a 87 22 20 | 5b 65 64 69 66 66 2d 75 |...!*." |[ediff-u|
|00005ff0| 70 64 61 74 65 2d 72 65 | 67 69 73 74 72 79 20 65 |pdate-re|gistry e|
|00006000| 64 69 66 66 2d 72 65 67 | 69 73 74 72 79 2d 62 75 |diff-reg|istry-bu|
|00006010| 66 66 65 72 20 67 65 74 | 2d 62 75 66 66 65 72 20 |ffer get|-buffer |
|00006020| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 65 72 72 6f |buffer-n|ame erro|
|00006030| 72 20 22 4e 6f 20 61 63 | 74 69 76 65 20 45 64 69 |r "No ac|tive Edi|
|00006040| 66 66 20 73 65 73 73 69 | 6f 6e 73 20 6f 72 20 63 |ff sessi|ons or c|
|00006050| 6f 72 72 75 70 74 65 64 | 20 73 65 73 73 69 6f 6e |orrupted| session|
|00006060| 20 72 65 67 69 73 74 72 | 79 22 20 6e 69 6c 20 66 | registr|y" nil f|
|00006070| 72 61 6d 65 20 77 69 6e | 64 20 53 74 61 72 74 42 |rame win|d StartB|
|00006080| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|00006090| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|000060a0| 20 65 64 69 66 66 2d 67 | 65 74 2d 76 69 73 69 62 | ediff-g|et-visib|
|000060b0| 6c 65 2d 62 75 66 66 65 | 72 2d 77 69 6e 64 6f 77 |le-buffe|r-window|
|000060c0| 20 6d 65 73 73 61 67 65 | 20 22 41 6c 72 65 61 64 | message| "Alread|
|000060d0| 79 20 73 68 6f 77 69 6e | 67 20 74 68 65 20 72 65 |y showin|g the re|
|000060e0| 67 69 73 74 72 79 22 20 | 73 65 74 2d 77 69 6e 64 |gistry" |set-wind|
|000060f0| 6f 77 2d 62 75 66 66 65 | 72 20 73 65 6c 65 63 74 |ow-buffe|r select|
|00006100| 2d 77 69 6e 64 6f 77 20 | 77 69 6e 64 6f 77 2d 6c |-window |window-l|
|00006110| 69 76 65 2d 70 20 65 64 | 69 66 66 2d 77 69 6e 64 |ive-p ed|iff-wind|
|00006120| 6f 77 2d 43 20 65 64 69 | 66 66 2d 77 69 6e 64 6f |ow-C edi|ff-windo|
|00006130| 77 2d 41 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |w-A edif|f-window|
|00006140| 2d 42 20 65 64 69 66 66 | 2d 6d 65 74 61 2d 62 75 |-B ediff|-meta-bu|
|00006150| 66 66 65 72 20 65 64 69 | 66 66 2d 64 65 76 69 63 |ffer edi|ff-devic|
|00006160| 65 2d 74 79 70 65 20 28 | 74 74 79 20 73 74 72 65 |e-type (|tty stre|
|00006170| 61 6d 29 20 6f 74 68 65 | 72 2d 77 69 6e 64 6f 77 |am) othe|r-window|
|00006180| 20 31 20 73 65 6c 65 63 | 74 65 64 2d 77 69 6e 64 | 1 selec|ted-wind|
|00006190| 6f 77 20 65 64 69 66 66 | 2d 73 6b 69 70 2d 75 6e |ow ediff|-skip-un|
|000061a0| 73 75 69 74 61 62 6c 65 | 2d 66 72 61 6d 65 73 20 |suitable|-frames |
|000061b0| 6f 6b 2d 75 6e 73 70 6c | 69 74 74 61 62 6c 65 20 |ok-unspl|ittable |
|000061c0| 74 68 69 73 2d 63 6f 6d | 6d 61 6e 64 20 65 64 69 |this-com|mand edi|
|000061d0| 66 66 2d 71 75 69 74 20 | 22 59 6f 75 27 76 65 20 |ff-quit |"You've |
|000061e0| 6b 69 6c 6c 65 64 20 61 | 6e 20 65 73 73 65 6e 74 |killed a|n essent|
|000061f0| 69 61 6c 20 45 64 69 66 | 66 20 62 75 66 66 65 72 |ial Edif|f buffer|
|00006200| 2d 2d 2d 50 6c 65 61 73 | 65 20 71 75 69 74 20 45 |---Pleas|e quit E|
|00006210| 64 69 66 66 22 20 77 69 | 6e 64 6f 77 2d 66 72 61 |diff" wi|ndow-fra|
|00006220| 6d 65 20 72 61 69 73 65 | 2d 66 72 61 6d 65 20 65 |me raise|-frame e|
|00006230| 64 69 66 66 2d 72 65 73 | 65 74 2d 6d 6f 75 73 65 |diff-res|et-mouse|
|00006240| 20 72 75 6e 2d 68 6f 6f | 6b 73 20 65 64 69 66 66 | run-hoo|ks ediff|
|00006250| 2d 73 68 6f 77 2d 72 65 | 67 69 73 74 72 79 2d 68 |-show-re|gistry-h|
|00006260| 6f 6f 6b 73 5d 20 33 20 | 22 5c 0a 44 69 73 70 6c |ooks] 3 |"\.Displ|
|00006270| 61 79 20 45 64 69 66 66 | 27 73 20 72 65 67 69 73 |ay Ediff|'s regis|
|00006280| 74 72 79 2e 22 20 6e 69 | 6c 5d 29 0a 28 62 79 74 |try." ni|l]).(byt|
|00006290| 65 2d 63 6f 64 65 20 22 | c0 c1 c2 5c 22 88 c3 c4 |e-code "|...\"...|
|000062a0| 4d 88 c5 c6 4d 88 c7 c8 | 4d 88 c9 ca 4d 87 22 20 |M...M...|M...M." |
|000062b0| 5b 64 65 66 61 6c 69 61 | 73 20 65 72 65 67 69 73 |[defalia|s eregis|
|000062c0| 74 72 79 20 65 64 69 66 | 66 2d 73 68 6f 77 2d 72 |try edif|f-show-r|
|000062d0| 65 67 69 73 74 72 79 20 | 65 64 69 66 66 2d 75 70 |egistry |ediff-up|
|000062e0| 64 61 74 65 2d 6d 65 74 | 61 2d 62 75 66 66 65 72 |date-met|a-buffer|
|000062f0| 20 23 5b 28 6d 65 74 61 | 2d 62 75 66 29 20 22 70 | #[(meta|-buf) "p|
|00006300| 18 70 ab cb c1 70 21 ab | c6 c2 c1 70 21 21 ab bf |.p...p!.|...p!!..|
|00006310| c3 8e 70 71 88 0c ad b4 | c1 0c 21 ad af c2 c1 0c |..pq....|..!.....|
|00006320| 21 21 ad a8 70 18 0c ab | 99 c1 0c 21 ab 94 c2 c1 |!!..p...|...!....|
|00006330| 0c 21 21 ab 8d c5 8e 0c | 71 88 0e 06 0e 07 21 29 |.!!.....|q.....!)|
|00006340| aa 89 0e 08 c9 3d ae 83 | ca cb 21 29 29 aa 89 0e |.....=..|..!))...|
|00006350| 08 c9 3d ae 83 ca cb 21 | 29 87 22 20 5b 53 74 61 |..=....!|)." [Sta|
|00006360| 72 74 42 75 66 66 65 72 | 20 67 65 74 2d 62 75 66 |rtBuffer| get-buf|
|00006370| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |fer buff|er-name |
|00006380| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00006390| 72 74 42 75 66 66 65 72 | 29 29 20 6d 65 74 61 2d |rtBuffer|)) meta-|
|000063a0| 62 75 66 20 28 28 73 65 | 74 2d 62 75 66 66 65 72 |buf ((se|t-buffer|
|000063b0| 20 53 74 61 72 74 42 75 | 66 66 65 72 29 29 20 65 | StartBu|ffer)) e|
|000063c0| 64 69 66 66 2d 6d 65 74 | 61 2d 72 65 64 72 61 77 |diff-met|a-redraw|
|000063d0| 2d 66 75 6e 63 74 69 6f | 6e 20 65 64 69 66 66 2d |-functio|n ediff-|
|000063e0| 6d 65 74 61 2d 6c 69 73 | 74 20 74 68 69 73 2d 63 |meta-lis|t this-c|
|000063f0| 6f 6d 6d 61 6e 64 20 65 | 64 69 66 66 2d 71 75 69 |ommand e|diff-qui|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
